Merge pull request #49 from zopefoundation/config-with-pure-python-autopep8

Config with pure python

4 files changed, 25 insertions, 22 deletions

diff --git a/src/zope/i18n/locales/tests/test_docstrings.py b/src/zope/i18n/locales/tests/test_docstrings.py
index fa52078..faa4e97 100644
--- a/src/zope/i18n/locales/tests/test_docstrings.py
+++ b/src/zope/i18n/locales/tests/test_docstrings.py
@@ -20,6 +20,7 @@ from zope.i18n.locales.inheritance import NoParentException
 
 from zope.i18n.testing import unicode_checker
 
+
 class LocaleInheritanceStub(AttributeInheritance):
 
     def __init__(self, nextLocale=None):
@@ -36,7 +37,4 @@ def test_suite():
         DocTestSuite('zope.i18n.locales', checker=unicode_checker),
         DocTestSuite('zope.i18n.locales.inheritance', checker=unicode_checker),
         DocTestSuite('zope.i18n.locales.xmlfactory', checker=unicode_checker),
-        ))
-
-if __name__ == '__main__':
-    unittest.main()
+    ))
diff --git a/src/zope/i18n/locales/tests/test_fallbackcollator.py b/src/zope/i18n/locales/tests/test_fallbackcollator.py
index 7e10b50..ad78b72 100644
--- a/src/zope/i18n/locales/tests/test_fallbackcollator.py
+++ b/src/zope/i18n/locales/tests/test_fallbackcollator.py
@@ -17,11 +17,9 @@ import doctest
 
 from zope.i18n.testing import unicode_checker
 
+
 def test_suite():
     return unittest.TestSuite((
-        doctest.DocFileSuite('../fallbackcollator.txt', checker=unicode_checker),
-        ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-
+        doctest.DocFileSuite('../fallbackcollator.txt',
+                             checker=unicode_checker),
+    ))
diff --git a/src/zope/i18n/locales/tests/test_locales.py b/src/zope/i18n/locales/tests/test_locales.py
index 2b100b8..523b1d2 100644
--- a/src/zope/i18n/locales/tests/test_locales.py
+++ b/src/zope/i18n/locales/tests/test_locales.py
@@ -24,6 +24,7 @@ from zope.i18n.locales.provider import LocaleProvider, LoadLocaleError
 import zope.i18n
 datadir = os.path.join(os.path.dirname(zope.i18n.__file__), 'locales', 'data')
 
+
 class AbstractTestILocaleProviderMixin(object):
     """Test the functionality of an implmentation of the ILocaleProvider
     interface."""
@@ -143,6 +144,7 @@ class TestGlobalLocaleProvider(TestCase):
         self.assertEqual(locale.id.territory, 'GB')
         self.assertEqual(locale.id.variant, None)
 
+
 class TestRootLocale(TestCase):
     """There were some complaints that the root locale does not work
     correctly, so make sure it does."""
diff --git a/src/zope/i18n/locales/tests/test_xmlfactory.py b/src/zope/i18n/locales/tests/test_xmlfactory.py
index 792c96d..e11097c 100644
--- a/src/zope/i18n/locales/tests/test_xmlfactory.py
+++ b/src/zope/i18n/locales/tests/test_xmlfactory.py
@@ -19,6 +19,7 @@ from unittest import TestCase, TestSuite
 from zope.i18n.locales.xmlfactory import LocaleFactory
 import zope.i18n
 
+
 class LocaleXMLFileTestCase(TestCase):
     """This test verifies that every locale XML file can be loaded."""
 
@@ -33,20 +34,24 @@ class LocaleXMLFileTestCase(TestCase):
         # XXX: The tests below are commented out because it's not
         # necessary for the xml files to have all format definitions.
 
-        ## Making sure all number format patterns parse
-        #for category in (u'decimal', u'scientific', u'percent', u'currency'):
-        #    for length in getattr(locale.numbers, category+'Formats').values():
+        # Making sure all number format patterns parse
+        # for category in (u'decimal', u'scientific', u'percent', u'currency'):
+        #    for length in getattr(
+        #        locale.numbers, category + 'Formats'
+        #     ).values():
         #        for format in length.formats.values():
-        #            self.assert_(parseNumberPattern(format.pattern) is not None)
-
-        ## Making sure all datetime patterns parse
-        #for calendar in locale.dates.calendars.values():
-        #    for category in ('date', 'time', 'dateTime'):
-        #        for length in getattr(calendar, category+'Formats').values():
-        #            for format in length.formats.values():
-        #                self.assert_(
-        #                    parseDateTimePattern(format.pattern) is not None)
+        #            self.assertIsNotNone(parseNumberPattern(format.pattern)
 
+        # Making sure all datetime patterns parse
+        # for calendar in locale.dates.calendars.values():
+        #     for category in ('date', 'time', 'dateTime'):
+        #         for length in getattr(
+        #             calendar, category + 'Formats'
+        #         ).values():
+        #             for format in length.formats.values():
+        #                 self.assertIsNotNone(
+        #                     parseDateTimePattern(format.pattern)
+        #                 )
 
 
 def test_suite():