Merge lp:~dobey/dirspec/new-pep8-warnings into lp:dirspec

[dobey]

Fix pep8 warnings that are newly presented in pep8 1.3

[Alejandro J. Cura (alecu)]

+1

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/dirspec/new-pep8-warnings into lp:dirspec failed. Below is the output from the failed tests.

running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/dirspec
copying dirspec/utils.py -> build/lib.linux-x86_64-2.7/dirspec
copying dirspec/basedir.py -> build/lib.linux-x86_64-2.7/dirspec
copying dirspec/__init__.py -> build/lib.linux-x86_64-2.7/dirspec
running test
running egg_info
creating dirspec.egg-info
writing dirspec.egg-info/PKG-INFO
writing top-level names to dirspec.egg-info/top_level.txt
writing dependency_links to dirspec.egg-info/dependency_links.txt
writing manifest file 'dirspec.egg-info/SOURCES.txt'
reading manifest file 'dirspec.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'dirspec.egg-info/SOURCES.txt'
running build_ext

+ python ./setup.py build test clean
test_cache_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_cache_home ... ok
test_config_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_config_dirs ... ok
test_config_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_config_home ... ok
test_data_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_data_dirs ... ok
test_data_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_data_home ... ok
test_default_cache_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_cache_home ... ok
test_default_config_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_config_dirs ... ok
test_default_config_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_config_home ... ok
test_default_data_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_data_dirs ... ok
test_default_data_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_data_home ... ok
test_load_config_paths_filter (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_load_config_paths_filter ... ok
test_save_config_path (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_save_config_path ... ok
test_xdg_cache_home_is_utf8_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_cache_home_is_utf8_bytes ... ok
test_xdg_config_dirs_are_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_config_dirs_are_bytes ... ok
test_xdg_config_home_is_utf8_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_config_home_is_utf8_bytes ... ok
test_xdg_data_dirs_are_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_data_dirs_are_bytes ... ok
test...

=== modified file 'dirspec/basedir.py'
--- dirspec/basedir.py	2012-07-13 18:14:17 +0000
+++ dirspec/basedir.py	2012-11-28 16:11:34 +0000
@@ -56,8 +56,8 @@
     """Get the paths for the XDG config directories."""
     result = [get_xdg_config_home()]
     result.extend([x.encode('utf-8') for x in get_env_path(
-                'XDG_CONFIG_DIRS',
-                default_config_path).decode('utf-8').split(os.pathsep)])
+        'XDG_CONFIG_DIRS',
+        default_config_path).decode('utf-8').split(os.pathsep)])
     return result
 
 
@@ -65,8 +65,8 @@
     """Get the paths for the XDG data directories."""
     result = [get_xdg_data_home()]
     result.extend([x.encode('utf-8') for x in get_env_path(
-                'XDG_DATA_DIRS',
-                default_data_path).decode('utf-8').split(os.pathsep)])
+        'XDG_DATA_DIRS',
+        default_data_path).decode('utf-8').split(os.pathsep)])
     return result
 
 

=== modified file 'dirspec/tests/test_basedir.py'
--- dirspec/tests/test_basedir.py	2012-07-13 18:14:17 +0000
+++ dirspec/tests/test_basedir.py	2012-11-28 16:11:34 +0000
@@ -28,15 +28,19 @@
 
     def test_cache_home(self):
         """Test that XDG_CACHE_HOME is handled correctly."""
-        self.tweak_env('XDG_CACHE_HOME', os.path.abspath(os.path.join(
-                os.getcwd(), '_trial_temp', 'cache')))
+        self.tweak_env('XDG_CACHE_HOME',
+                       os.path.abspath(os.path.join(os.getcwd(),
+                                                    '_trial_temp',
+                                                    'cache')))
         self.assertEqual(os.environ['XDG_CACHE_HOME'].encode('utf-8'),
                          basedir.get_xdg_cache_home())
 
     def test_config_dirs(self):
         """Test that XDG_CONFIG_HOME is handled correctly."""
-        self.tweak_env('XDG_CONFIG_HOME', os.path.abspath(os.path.join(
-                os.getcwd(), '_trial_temp', 'config')))
+        self.tweak_env('XDG_CONFIG_HOME',
+                       os.path.abspath(os.path.join(os.getcwd(),
+                                                    '_trial_temp',
+                                                    'config')))
         self.tweak_env('XDG_CONFIG_DIRS', os.pathsep.join(['etc']))
         self.assertEqual([os.environ['XDG_CONFIG_HOME'].encode('utf-8'),
                           b'etc'],
@@ -44,15 +48,19 @@
 
     def test_config_home(self):
         """Test that XDG_CONFIG_DIRS is handled correctly."""
-        self.tweak_env('XDG_CONFIG_HOME', os.path.abspath(os.path.join(
-                os.getcwd(), '_trial_temp', 'config')))
+        self.tweak_env('XDG_CONFIG_HOME',
+                       os.path.abspath(os.path.join(os.getcwd(),
+                                                    '_trial_temp',
+                                                    'config')))
         self.assertEqual(os.environ['XDG_CONFIG_HOME'].encode('utf-8'),
                          basedir.get_xdg_config_home())
 
     def test_data_dirs(self):
         """Test that XDG_DATA_HOME is handled correctly."""
-        self.tweak_env('XDG_DATA_HOME', os.path.abspath(os.path.join(
-                os.getcwd(), '_trial_temp', 'xdg_data')))
+        self.tweak_env('XDG_DATA_HOME',
+                       os.path.abspath(os.path.join(os.getcwd(),
+                                                    '_trial_temp',
+                                                    'xdg_data')))
         self.tweak_env('XDG_DATA_DIRS', os.pathsep.join(['foo', 'bar']))
         self.assertEqual([os.environ['XDG_DATA_HOME'].encode('utf-8'),
                           b'foo', b'bar'],
@@ -60,8 +68,10 @@
 
     def test_data_home(self):
         """Test that XDG_DATA_HOME is handled correctly."""
-        self.tweak_env('XDG_DATA_HOME', os.path.abspath(os.path.join(
-                os.getcwd(), '_trial_temp', 'xdg_data')))
+        self.tweak_env('XDG_DATA_HOME',
+                       os.path.abspath(os.path.join(os.getcwd(),
+                                                    '_trial_temp',
+                                                    'xdg_data')))
         self.assertEqual(os.environ['XDG_DATA_HOME'].encode('utf-8'),
                          basedir.get_xdg_data_home())
 

=== modified file 'dirspec/tests/test_utils.py'
--- dirspec/tests/test_utils.py	2012-07-13 19:20:25 +0000
+++ dirspec/tests/test_utils.py	2012-11-28 16:11:34 +0000
@@ -87,7 +87,8 @@
         self.assertEqual(
             special_folders['Local AppData'],
             shell_module.values[FakeShellConModule.CSIDL_LOCAL_APPDATA])
-        self.assertTrue(special_folders['Local AppData'].startswith(
+        self.assertTrue(
+            special_folders['Local AppData'].startswith(
                 special_folders['AppData']))
         self.assertEqual(
             special_folders['Common AppData'],

=== modified file 'setup.py'
--- setup.py	2012-10-31 18:33:20 +0000
+++ setup.py	2012-11-28 16:11:34 +0000
@@ -17,13 +17,12 @@
 """Setup and install dirspec."""
 from setuptools import setup
 
-setup(
-    name='dirspec',
-    version='4.3',
-    description='XDG Base and User directories implementation',
-    license='GNU LGPL v3',
-    url='https://launchpad.net/dirspec',
-    download_url='https://launchpad.net/dirspec/+download',
-    packages=['dirspec'],
-    test_suite='dirspec.tests',
-    )
+setup(name='dirspec',
+      version='4.3',
+      description='XDG Base and User directories implementation',
+      license='GNU LGPL v3',
+      url='https://launchpad.net/dirspec',
+      download_url='https://launchpad.net/dirspec/+download',
+      packages=['dirspec'],
+      test_suite='dirspec.tests',
+      )