From 20662c2a43ca5d214cdf88f0668b27b2c05df7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Sun, 3 Mar 2013 19:44:57 -0800 Subject: [PATCH] flake8-ed the tests --- tests/default_conf.py | 2 +- tests/support.py | 67 +++++++++++++++++-------------------- tests/test_contents.py | 56 +++++++++++++------------------ tests/test_generators.py | 52 +++++++++++++++++------------ tests/test_importer.py | 5 +-- tests/test_plugins.py | 13 ++++---- tests/test_readers.py | 72 +++++++++++++++++++++++----------------- tests/test_settings.py | 5 +-- tests/test_utils.py | 18 ++++++---- tests/test_webassets.py | 8 ++--- 10 files changed, 155 insertions(+), 143 deletions(-) diff --git a/tests/default_conf.py b/tests/default_conf.py index 09548fdd..bc3a7dff 100644 --- a/tests/default_conf.py +++ b/tests/default_conf.py @@ -30,7 +30,7 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'), DEFAULT_METADATA = (('yeah', 'it is'),) # static paths will be copied under the same name -STATIC_PATHS = ["pictures",] +STATIC_PATHS = ["pictures", ] # A list of files to copy from the source to the destination FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),) diff --git a/tests/support.py b/tests/support.py index 209cc665..b81e6eff 100644 --- a/tests/support.py +++ b/tests/support.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals, print_function -__all__ = [ - 'get_article', - 'unittest', -] +__all__ = ['get_article', 'unittest', ] import os import re @@ -44,19 +41,19 @@ def temporary_folder(): def isplit(s, sep=None): - """ - Behave like str.split but returns a generator instead of a list. + """Behaves like str.split but returns a generator instead of a list. - >>> list(isplit('\tUse the force\n')) == '\tUse the force\n'.split() - True - >>> list(isplit('\tUse the force\n')) == ['Use', 'the', 'force'] - True - >>> list(isplit('\tUse the force\n', "e")) == '\tUse the force\n'.split("e") - True - >>> list(isplit('Use the force', "e")) == 'Use the force'.split("e") - True - >>> list(isplit('Use the force', "e")) == ['Us', ' th', ' forc', ''] - True + >>> list(isplit('\tUse the force\n')) == '\tUse the force\n'.split() + True + >>> list(isplit('\tUse the force\n')) == ['Use', 'the', 'force'] + True + >>> (list(isplit('\tUse the force\n', "e")) + == '\tUse the force\n'.split("e")) + True + >>> list(isplit('Use the force', "e")) == 'Use the force'.split("e") + True + >>> list(isplit('Use the force', "e")) == ['Us', ' th', ' forc', ''] + True """ sep, hardsep = r'\s+' if sep is None else re.escape(sep), sep is not None @@ -76,24 +73,23 @@ def isplit(s, sep=None): def mute(returns_output=False): - """ - Decorate a function that prints to stdout, intercepting the output. - If "returns_output" is True, the function will return a generator - yielding the printed lines instead of the return values. + """Decorate a function that prints to stdout, intercepting the output. + If "returns_output" is True, the function will return a generator + yielding the printed lines instead of the return values. - The decorator litterally hijack sys.stdout during each function - execution, so be careful with what you apply it to. + The decorator litterally hijack sys.stdout during each function + execution, so be careful with what you apply it to. - >>> def numbers(): - print "42" - print "1984" - ... - >>> numbers() - 42 - 1984 - >>> mute()(numbers)() - >>> list(mute(True)(numbers)()) - ['42', '1984'] + >>> def numbers(): + print "42" + print "1984" + ... + >>> numbers() + 42 + 1984 + >>> mute()(numbers)() + >>> list(mute(True)(numbers)()) + ['42', '1984'] """ @@ -164,9 +160,7 @@ def get_settings(): class LogCountHandler(BufferingHandler): - """ - Capturing and counting logged messages. - """ + """Capturing and counting logged messages.""" def __init__(self, capacity=1000): logging.handlers.BufferingHandler.__init__(self, capacity) @@ -179,8 +173,7 @@ class LogCountHandler(BufferingHandler): class LoggedTestCase(unittest.TestCase): - """A test case that captures log messages - """ + """A test case that captures log messages.""" def setUp(self): super(LoggedTestCase, self).setUp() diff --git a/tests/test_contents.py b/tests/test_contents.py index 9bb77ec3..c837ea03 100644 --- a/tests/test_contents.py +++ b/tests/test_contents.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals +from datetime import datetime +from sys import platform + from .support import unittest from pelican.contents import Page, Article, URLWrapper @@ -31,10 +34,8 @@ class TestPage(unittest.TestCase): } def test_use_args(self): - """Creating a page with arguments passed to the constructor should use - them to initialise object's attributes. - - """ + # Creating a page with arguments passed to the constructor should use + # them to initialise object's attributes. metadata = {'foo': 'bar', 'foobar': 'baz', 'title': 'foobar', } page = Page(TEST_CONTENT, metadata=metadata, context={'localsiteurl': ''}) @@ -44,22 +45,22 @@ class TestPage(unittest.TestCase): self.assertEqual(page.content, TEST_CONTENT) def test_mandatory_properties(self): - """If the title is not set, must throw an exception.""" + # If the title is not set, must throw an exception. page = Page('content') - with self.assertRaises(NameError) as cm: + with self.assertRaises(NameError): page.check_properties() page = Page('content', metadata={'title': 'foobar'}) page.check_properties() def test_summary_from_metadata(self): - """If a :summary: metadata is given, it should be used.""" + # If a :summary: metadata is given, it should be used page = Page(**self.page_kwargs) self.assertEqual(page.summary, TEST_SUMMARY) def test_summary_max_length(self): - """If a :SUMMARY_MAX_LENGTH: is set, and there is no other summary, generated summary - should not exceed the given length.""" + # If a :SUMMARY_MAX_LENGTH: is set, and there is no other summary, + # generated summary should not exceed the given length. page_kwargs = self._copy_page_kwargs() settings = _DEFAULT_CONFIG.copy() page_kwargs['settings'] = settings @@ -72,12 +73,12 @@ class TestPage(unittest.TestCase): self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10)) def test_slug(self): - """If a title is given, it should be used to generate the slug.""" + # If a title is given, it should be used to generate the slug. page = Page(**self.page_kwargs) self.assertEqual(page.slug, 'foo-bar') def test_defaultlang(self): - """If no lang is given, default to the default one.""" + # If no lang is given, default to the default one. page = Page(**self.page_kwargs) self.assertEqual(page.lang, _DEFAULT_CONFIG['DEFAULT_LANG']) @@ -87,10 +88,9 @@ class TestPage(unittest.TestCase): self.assertEqual(page.lang, 'fr') def test_save_as(self): - """If a lang is not the default lang, save_as should be set - accordingly. + # If a lang is not the default lang, save_as should be set + # accordingly. - """ # if a title is defined, save_as should be set page = Page(**self.page_kwargs) self.assertEqual(page.save_as, "pages/foo-bar.html") @@ -101,8 +101,7 @@ class TestPage(unittest.TestCase): self.assertEqual(page.save_as, "pages/foo-bar-fr.html") def test_metadata_url_format(self): - """Arbitrary metadata should be passed through url_format() - """ + # Arbitrary metadata should be passed through url_format() page = Page(**self.page_kwargs) self.assertIn('summary', page.url_format.keys()) page.metadata['directory'] = 'test-dir' @@ -111,10 +110,7 @@ class TestPage(unittest.TestCase): self.assertEqual(page.save_as, 'test-dir/foo-bar') def test_datetime(self): - """If DATETIME is set to a tuple, it should be used to override LOCALE - """ - from datetime import datetime - from sys import platform + # If DATETIME is set to a tuple, it should be used to override LOCALE dt = datetime(2015, 9, 13) page_kwargs = self._copy_page_kwargs() @@ -126,7 +122,6 @@ class TestPage(unittest.TestCase): self.assertEqual(page.locale_date, dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT'])) - page_kwargs['settings'] = dict([(x, _DEFAULT_CONFIG[x]) for x in _DEFAULT_CONFIG]) @@ -154,9 +149,7 @@ class TestPage(unittest.TestCase): unittest.skip("There is no locale %s in this system." % locale) def test_template(self): - """ - Pages default to page, metadata overwrites - """ + # Pages default to page, metadata overwrites default_page = Page(**self.page_kwargs) self.assertEqual('page', default_page.template) page_kwargs = self._copy_page_kwargs() @@ -177,21 +170,19 @@ class TestPage(unittest.TestCase): return page_kwargs def test_signal(self): - """If a title is given, it should be used to generate the slug.""" + # If a title is given, it should be used to generate the slug. - def receiver_test_function(sender,instance): + def receiver_test_function(sender, instance): pass - content_object_init.connect(receiver_test_function ,sender=Page) - page = Page(**self.page_kwargs) + content_object_init.connect(receiver_test_function, sender=Page) + Page(**self.page_kwargs) self.assertTrue(content_object_init.has_receivers_for(Page)) class TestArticle(TestPage): def test_template(self): - """ - Articles default to article, metadata overwrites - """ + # Articles default to article, metadata overwrites default_article = Article(**self.page_kwargs) self.assertEqual('article', default_article.template) article_kwargs = self._copy_page_kwargs() @@ -202,8 +193,7 @@ class TestArticle(TestPage): class TestURLWrapper(unittest.TestCase): def test_comparisons(self): - """URLWrappers are sorted by name - """ + # URLWrappers are sorted by name wrapper_a = URLWrapper(name='first', settings={}) wrapper_b = URLWrapper(name='last', settings={}) self.assertFalse(wrapper_a > wrapper_b) diff --git a/tests/test_generators.py b/tests/test_generators.py index 54fe7e61..7a6e67fb 100644 --- a/tests/test_generators.py +++ b/tests/test_generators.py @@ -26,7 +26,7 @@ class TestArticlesGenerator(unittest.TestCase): def get_populated_generator(self): """ We only need to pull all the test articles once, but read from it - for each test. + for each test. """ if self.generator is None: settings = get_settings() @@ -58,7 +58,8 @@ class TestArticlesGenerator(unittest.TestCase): settings['THEME'], None, settings['MARKUP']) writer = MagicMock() generator.generate_feeds(writer) - writer.write_feed.assert_called_with([], settings, 'feeds/all.atom.xml') + writer.write_feed.assert_called_with([], settings, + 'feeds/all.atom.xml') generator = ArticlesGenerator(settings, {'FEED_ALL_ATOM': None}, None, settings['THEME'], None, None) @@ -72,16 +73,21 @@ class TestArticlesGenerator(unittest.TestCase): articles = self.distill_articles(generator.articles) articles_expected = [ ['Article title', 'published', 'Default', 'article'], - ['Article with markdown and summary metadata single', 'published', 'Default', 'article'], - ['Article with markdown and summary metadata multi', 'published', 'Default', 'article'], + ['Article with markdown and summary metadata single', 'published', + 'Default', 'article'], + ['Article with markdown and summary metadata multi', 'published', + 'Default', 'article'], ['Article with template', 'published', 'Default', 'custom'], ['Test md File', 'published', 'test', 'article'], ['Rst with filename metadata', 'published', 'yeah', 'article'], ['Test Markdown extensions', 'published', 'Default', 'article'], ['This is a super article !', 'published', 'Yeah', 'article'], - ['This is an article with category !', 'published', 'yeah', 'article'], - ['This is an article without category !', 'published', 'Default', 'article'], - ['This is an article without category !', 'published', 'TestCategory', 'article'], + ['This is an article with category !', 'published', 'yeah', + 'article'], + ['This is an article without category !', 'published', 'Default', + 'article'], + ['This is an article without category !', 'published', + 'TestCategory', 'article'], ['This is a super article !', 'published', 'yeah', 'article'] ] self.assertItemsEqual(articles_expected, articles) @@ -90,7 +96,8 @@ class TestArticlesGenerator(unittest.TestCase): generator = self.get_populated_generator() categories = [cat.name for cat, _ in generator.categories] - categories_expected = ['Default', 'TestCategory', 'Yeah', 'test', 'yeah'] + categories_expected = ['Default', 'TestCategory', 'Yeah', 'test', + 'yeah'] self.assertEquals(categories, categories_expected) def test_do_not_use_folder_as_category(self): @@ -153,23 +160,24 @@ class TestArticlesGenerator(unittest.TestCase): """ generator = self.get_populated_generator() articles = self.distill_articles(generator.articles) - custom_template = ['Article with template', 'published', 'Default', 'custom'] - standard_template = ['This is a super article !', 'published', 'Yeah', 'article'] + custom_template = ['Article with template', 'published', 'Default', + 'custom'] + standard_template = ['This is a super article !', 'published', 'Yeah', + 'article'] self.assertIn(custom_template, articles) self.assertIn(standard_template, articles) + class TestPageGenerator(unittest.TestCase): - """ - Every time you want to test for a new field; - Make sure the test pages in "TestPages" have all the fields - Add it to distilled in distill_pages - Then update the assertItemsEqual in test_generate_context to match expected - """ + # Note: Every time you want to test for a new field; Make sure the test + # pages in "TestPages" have all the fields Add it to distilled in + # distill_pages Then update the assertItemsEqual in test_generate_context + # to match expected def distill_pages(self, pages): distilled = [] for page in pages: - distilled.append([ + distilled.append([ page.title, page.status, page.template @@ -192,16 +200,18 @@ class TestPageGenerator(unittest.TestCase): pages_expected = [ ['This is a test page', 'published', 'page'], ['This is a markdown test page', 'published', 'page'], - ['This is a test page with a preset template', 'published', 'custom'] + ['This is a test page with a preset template', 'published', + 'custom'] ] hidden_pages_expected = [ ['This is a test hidden page', 'hidden', 'page'], ['This is a markdown test hidden page', 'hidden', 'page'], - ['This is a test hidden page with a custom template', 'hidden', 'custom'] + ['This is a test hidden page with a custom template', 'hidden', + 'custom'] ] - self.assertItemsEqual(pages_expected,pages) - self.assertItemsEqual(hidden_pages_expected,hidden_pages) + self.assertItemsEqual(pages_expected, pages) + self.assertItemsEqual(hidden_pages_expected, hidden_pages) class TestTemplatePagesGenerator(unittest.TestCase): diff --git a/tests/test_importer.py b/tests/test_importer.py index a79cd493..38177918 100644 --- a/tests/test_importer.py +++ b/tests/test_importer.py @@ -53,8 +53,9 @@ class TestWordpressXmlImporter(unittest.TestCase): posts = list(self.posts) test_posts = [post for post in posts if post[2] == 'html-entity-test'] self.assertTrue(len(test_posts) == 1) - + post = test_posts[0] title = post[0] - self.assertTrue(title, "A normal post with some entities in the title. You can't miss them.") + self.assertTrue(title, "A normal post with some entities in the" + " title. You can't miss them.") self.assertTrue('&' not in title) diff --git a/tests/test_plugins.py b/tests/test_plugins.py index 9d6d43e6..f5da4ab1 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -10,11 +10,11 @@ from pelican.plugins import gzip_cache from .test_contents import TEST_CONTENT, TEST_SUMMARY from .support import unittest, temporary_folder + class TestGzipCache(unittest.TestCase): - '''Unit tests for the gzip cache plugin''' def test_should_compress(self): - '''Test that some filetypes should compress and others shouldn't.''' + # Some filetypes should compress and others shouldn't. self.assertTrue(gzip_cache.should_compress('foo.html')) self.assertTrue(gzip_cache.should_compress('bar.css')) self.assertTrue(gzip_cache.should_compress('baz.js')) @@ -26,16 +26,17 @@ class TestGzipCache(unittest.TestCase): self.assertFalse(gzip_cache.should_compress('foo.mov')) def test_creates_gzip_file(self): - '''Test that a file matching the input filename with a .gz extension is - created.''' + # A file matching the input filename with a .gz extension is created. + # The plugin walks over the output content after the finalized signal # so it is safe to assume that the file exists (otherwise walk would # not report it). Therefore, create a dummy file to use. with temporary_folder() as tempdir: - (_, a_html_filename) = tempfile.mkstemp(suffix='.html', dir=tempdir) + _, a_html_filename = tempfile.mkstemp(suffix='.html', dir=tempdir) gzip_cache.create_gzip_file(a_html_filename) self.assertTrue(os.path.exists(a_html_filename + '.gz')) + class TestSummary(unittest.TestCase): def setUp(self): super(TestSummary, self).setUp() @@ -92,7 +93,7 @@ class TestSummary(unittest.TestCase): page_kwargs = self._copy_page_kwargs() del page_kwargs['metadata']['summary'] page_kwargs['content'] = ( - 'FOOBAR' + TEST_SUMMARY + + 'FOOBAR' + TEST_SUMMARY + '' + TEST_CONTENT) page = Page(**page_kwargs) # test both the summary and the marker removal diff --git a/tests/test_readers.py b/tests/test_readers.py index be544caa..5e9e82b7 100644 --- a/tests/test_readers.py +++ b/tests/test_readers.py @@ -24,8 +24,8 @@ class RstReaderTest(unittest.TestCase): 'category': 'yeah', 'author': 'Alexis Métaireau', 'title': 'This is a super article !', - 'summary': '

Multi-line metadata should be'\ - ' supported\nas well as inline'\ + 'summary': '

Multi-line metadata should be' + ' supported\nas well as inline' ' markup.

\n', 'date': datetime.datetime(2010, 12, 2, 10, 14), 'tags': ['foo', 'bar', 'foobar'], @@ -64,8 +64,8 @@ class RstReaderTest(unittest.TestCase): content, metadata = readers.read_file( _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'), settings={ - 'FILENAME_METADATA': '(?P\d{4}-\d{2}-\d{2})_' \ - '_(?P.*)' \ + 'FILENAME_METADATA': '(?P\d{4}-\d{2}-\d{2})_' + '_(?P.*)' '#(?P.*)-(?P.*)' }) expected = { @@ -82,19 +82,21 @@ class RstReaderTest(unittest.TestCase): def test_article_metadata_key_lowercase(self): """Keys of metadata should be lowercase.""" reader = readers.RstReader({}) - content, metadata = reader.read(_path('article_with_uppercase_metadata.rst')) + content, metadata = reader.read( + _path('article_with_uppercase_metadata.rst')) - self.assertIn('category', metadata, "Key should be lowercase.") - self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.") + self.assertIn('category', metadata, 'Key should be lowercase.') + self.assertEquals('Yeah', metadata.get('category'), + 'Value keeps case.') def test_typogrify(self): # if nothing is specified in the settings, the content should be # unmodified content, _ = readers.read_file(_path('article.rst')) - expected = "

This is some content. With some stuff to "\ - ""typogrify".

\n

Now with added "\ - 'support for '\ - 'TLA.

\n' + expected = ('

This is some content. With some stuff to ' + '"typogrify".

\n

Now with added ' + 'support for ' + 'TLA.

\n') self.assertEqual(content, expected) @@ -102,10 +104,10 @@ class RstReaderTest(unittest.TestCase): # otherwise, typogrify should be applied content, _ = readers.read_file(_path('article.rst'), settings={'TYPOGRIFY': True}) - expected = "

This is some content. With some stuff to "\ - "“typogrify”.

\n

Now with added "\ - 'support for '\ - 'TLA.

\n' + expected = ('

This is some content. With some stuff to ' + '“typogrify”.

\n

Now with added ' + 'support for ' + 'TLA.

\n') self.assertEqual(content, expected) except ImportError: @@ -159,7 +161,8 @@ class MdReaderTest(unittest.TestCase): @unittest.skipUnless(readers.Markdown, "markdown isn't installed") def test_article_with_markdown_markup_extension(self): - # test to ensure the markdown markup extension is being processed as expected + # test to ensure the markdown markup extension is being processed as + # expected content, metadata = readers.read_file( _path('article_with_markdown_markup_extensions.md'), settings={'MD_EXTENSIONS': ['toc', 'codehilite', 'extra']}) @@ -218,15 +221,19 @@ class MdReaderTest(unittest.TestCase): for key, value in expected.items(): self.assertEquals(value, metadata[key], key) + class AdReaderTest(unittest.TestCase): @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed") def test_article_with_asc_extension(self): - # test to ensure the asc extension is being processed by the correct reader + # Ensure the asc extension is being processed by the correct reader reader = readers.AsciiDocReader({}) - content, metadata = reader.read(_path('article_with_asc_extension.asc')) - expected = '
\n

Used for pelican test

\n'\ - '

The quick brown fox jumped over the lazy dog’s back.

\n' + content, metadata = reader.read( + _path('article_with_asc_extension.asc')) + expected = ('
\n

' + 'Used for pelican test

\n' + '

The quick brown fox jumped over' + ' the lazy dog’s back.

\n') self.assertEqual(content, expected) expected = { 'category': 'Blog', @@ -239,7 +246,6 @@ class AdReaderTest(unittest.TestCase): for key, value in expected.items(): self.assertEquals(value, metadata[key], key) - expected = { 'category': 'Blog', 'author': 'Author O. Article', @@ -254,13 +260,16 @@ class AdReaderTest(unittest.TestCase): @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed") def test_article_with_asc_options(self): # test to ensure the ASCIIDOC_OPTIONS is being used - reader = readers.AsciiDocReader(dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"])) + reader = readers.AsciiDocReader( + dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"])) content, metadata = reader.read(_path('article_with_asc_options.asc')) - expected = '
\n

Used for pelican test

\n'\ - '

version 1.0.42

\n'\ - '

The quick brown fox jumped over the lazy dog’s back.

\n' + expected = ('
\n

Used for' + ' pelican test

\n

version 1.0.42

\n' + '

The quick brown fox jumped over the lazy' + ' dog’s back.

\n') self.assertEqual(content, expected) + class HTMLReaderTest(unittest.TestCase): def test_article_with_comments(self): reader = readers.HTMLReader({}) @@ -297,10 +306,10 @@ class HTMLReaderTest(unittest.TestCase): for key, value in expected.items(): self.assertEquals(value, metadata[key], key) - def test_article_with_null_attributes(self): reader = readers.HTMLReader({}) - content, metadata = reader.read(_path('article_with_null_attributes.html')) + content, metadata = reader.read( + _path('article_with_null_attributes.html')) self.assertEquals(''' Ensure that empty attributes are copied properly. @@ -310,7 +319,8 @@ class HTMLReaderTest(unittest.TestCase): def test_article_metadata_key_lowercase(self): """Keys of metadata should be lowercase.""" reader = readers.HTMLReader({}) - content, metadata = reader.read(_path('article_with_uppercase_metadata.html')) - self.assertIn('category', metadata, "Key should be lowercase.") - self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.") - + content, metadata = reader.read( + _path('article_with_uppercase_metadata.html')) + self.assertIn('category', metadata, 'Key should be lowercase.') + self.assertEquals('Yeah', metadata.get('category'), + 'Value keeps cases.') diff --git a/tests/test_settings.py b/tests/test_settings.py index 0e610c55..2f2b6dc6 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -3,7 +3,8 @@ from __future__ import unicode_literals, print_function import copy from os.path import dirname, abspath, join -from pelican.settings import read_settings, configure_settings, _DEFAULT_CONFIG, DEFAULT_THEME +from pelican.settings import (read_settings, configure_settings, + _DEFAULT_CONFIG, DEFAULT_THEME) from .support import unittest @@ -35,7 +36,7 @@ class TestSettingsConfiguration(unittest.TestCase): """providing no file should return the default values.""" settings = read_settings(None) expected = copy.deepcopy(_DEFAULT_CONFIG) - expected["FEED_DOMAIN"] = '' #This is added by configure settings + expected['FEED_DOMAIN'] = '' # Added by configure settings self.maxDiff = None self.assertDictEqual(settings, expected) diff --git a/tests/test_utils.py b/tests/test_utils.py index c176325e..0da1dcfa 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -17,7 +17,8 @@ class TestUtils(LoggedTestCase): @utils.deprecated_attribute( old='_old_attribute', new='_new_attribute', since=(3, 1, 0), remove=(4, 1, 3)) - def _old_attribute(): return None + def _old_attribute(): + return None def test_deprecated_attribute(self): value = self._old_attribute @@ -60,8 +61,10 @@ class TestUtils(LoggedTestCase): ('this is a test', 'this-is-a-test'), ('this → is ← a ↑ test', 'this-is-a-test'), ('this--is---a test', 'this-is-a-test'), - ('unicode測試許功蓋，你看到了嗎？', 'unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma'), - ('大飯原発４号機、１８日夜起動へ', 'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),) + ('unicode測試許功蓋，你看到了嗎？', + 'unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma'), + ('大飯原発４号機、１８日夜起動へ', + 'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),) for value, expected in samples: self.assertEquals(utils.slugify(value), expected) @@ -122,7 +125,8 @@ class TestUtils(LoggedTestCase): shutil.rmtree(empty_path, True) def test_clean_output_dir(self): - test_directory = os.path.join(os.path.dirname(__file__), 'clean_output') + test_directory = os.path.join(os.path.dirname(__file__), + 'clean_output') content = os.path.join(os.path.dirname(__file__), 'content') shutil.copytree(content, test_directory) utils.clean_output_dir(test_directory) @@ -131,12 +135,14 @@ class TestUtils(LoggedTestCase): shutil.rmtree(test_directory) def test_clean_output_dir_not_there(self): - test_directory = os.path.join(os.path.dirname(__file__), 'does_not_exist') + test_directory = os.path.join(os.path.dirname(__file__), + 'does_not_exist') utils.clean_output_dir(test_directory) self.assertTrue(not os.path.exists(test_directory)) def test_clean_output_dir_is_file(self): - test_directory = os.path.join(os.path.dirname(__file__), 'this_is_a_file') + test_directory = os.path.join(os.path.dirname(__file__), + 'this_is_a_file') f = open(test_directory, 'w') f.write('') f.close() diff --git a/tests/test_webassets.py b/tests/test_webassets.py index 87b2789c..c2ba44da 100644 --- a/tests/test_webassets.py +++ b/tests/test_webassets.py @@ -45,8 +45,8 @@ class TestWebAssets(unittest.TestCase): def check_link_tag(self, css_file, html_file): """Check the presence of `css_file` in `html_file`.""" - link_tag = ''.\ - format(css_file=css_file) + link_tag = ('' + .format(css_file=css_file)) html = open(html_file).read() self.assertRegexpMatches(html, link_tag) @@ -94,8 +94,8 @@ class TestWebAssetsAbsoluteURLS(TestWebAssets): def test_absolute_url(self): """Look in the output files for the link tag with absolute url.""" - css_file = 'http://localhost/theme/gen/style.{0}.min.css'.\ - format(CSS_HASH) + css_file = ('http://localhost/theme/gen/style.{0}.min.css' + .format(CSS_HASH)) html_files = ['index.html', 'archives.html', 'this-is-an-article-with-category.html'] for f in html_files: