dirspec

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

  1. new-pep8-warnings
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 16
Merged at revision: 16
Proposed branch: lp:~dobey/dirspec/new-pep8-warnings
Merge into: lp:dirspec
Diff against target: 131 lines (+35/-25)
4 files modified
dirspec/basedir.py (+4/-4)
dirspec/tests/test_basedir.py (+20/-10)
dirspec/tests/test_utils.py (+2/-1)
setup.py (+9/-10)
To merge this branch: bzr merge lp:~dobey/dirspec/new-pep8-warnings
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Alejandro J. Cura (community) Approve
Review via email: mp+136701@code.launchpad.net

Commit message

Fix pep8 warnings that are newly presented in pep8 1.3

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

+1

review: Approve
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (6.0 KiB)

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...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
56 """Get the paths for the XDG config directories."""56 """Get the paths for the XDG config directories."""
57 result = [get_xdg_config_home()]57 result = [get_xdg_config_home()]
58 result.extend([x.encode('utf-8') for x in get_env_path(58 result.extend([x.encode('utf-8') for x in get_env_path(
59 'XDG_CONFIG_DIRS',59 'XDG_CONFIG_DIRS',
60 default_config_path).decode('utf-8').split(os.pathsep)])60 default_config_path).decode('utf-8').split(os.pathsep)])
61 return result61 return result
6262
6363
@@ -65,8 +65,8 @@
65 """Get the paths for the XDG data directories."""65 """Get the paths for the XDG data directories."""
66 result = [get_xdg_data_home()]66 result = [get_xdg_data_home()]
67 result.extend([x.encode('utf-8') for x in get_env_path(67 result.extend([x.encode('utf-8') for x in get_env_path(
68 'XDG_DATA_DIRS',68 'XDG_DATA_DIRS',
69 default_data_path).decode('utf-8').split(os.pathsep)])69 default_data_path).decode('utf-8').split(os.pathsep)])
70 return result70 return result
7171
7272
7373
=== 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 @@
2828
29 def test_cache_home(self):29 def test_cache_home(self):
30 """Test that XDG_CACHE_HOME is handled correctly."""30 """Test that XDG_CACHE_HOME is handled correctly."""
31 self.tweak_env('XDG_CACHE_HOME', os.path.abspath(os.path.join(31 self.tweak_env('XDG_CACHE_HOME',
32 os.getcwd(), '_trial_temp', 'cache')))32 os.path.abspath(os.path.join(os.getcwd(),
33 '_trial_temp',
34 'cache')))
33 self.assertEqual(os.environ['XDG_CACHE_HOME'].encode('utf-8'),35 self.assertEqual(os.environ['XDG_CACHE_HOME'].encode('utf-8'),
34 basedir.get_xdg_cache_home())36 basedir.get_xdg_cache_home())
3537
36 def test_config_dirs(self):38 def test_config_dirs(self):
37 """Test that XDG_CONFIG_HOME is handled correctly."""39 """Test that XDG_CONFIG_HOME is handled correctly."""
38 self.tweak_env('XDG_CONFIG_HOME', os.path.abspath(os.path.join(40 self.tweak_env('XDG_CONFIG_HOME',
39 os.getcwd(), '_trial_temp', 'config')))41 os.path.abspath(os.path.join(os.getcwd(),
42 '_trial_temp',
43 'config')))
40 self.tweak_env('XDG_CONFIG_DIRS', os.pathsep.join(['etc']))44 self.tweak_env('XDG_CONFIG_DIRS', os.pathsep.join(['etc']))
41 self.assertEqual([os.environ['XDG_CONFIG_HOME'].encode('utf-8'),45 self.assertEqual([os.environ['XDG_CONFIG_HOME'].encode('utf-8'),
42 b'etc'],46 b'etc'],
@@ -44,15 +48,19 @@
4448
45 def test_config_home(self):49 def test_config_home(self):
46 """Test that XDG_CONFIG_DIRS is handled correctly."""50 """Test that XDG_CONFIG_DIRS is handled correctly."""
47 self.tweak_env('XDG_CONFIG_HOME', os.path.abspath(os.path.join(51 self.tweak_env('XDG_CONFIG_HOME',
48 os.getcwd(), '_trial_temp', 'config')))52 os.path.abspath(os.path.join(os.getcwd(),
53 '_trial_temp',
54 'config')))
49 self.assertEqual(os.environ['XDG_CONFIG_HOME'].encode('utf-8'),55 self.assertEqual(os.environ['XDG_CONFIG_HOME'].encode('utf-8'),
50 basedir.get_xdg_config_home())56 basedir.get_xdg_config_home())
5157
52 def test_data_dirs(self):58 def test_data_dirs(self):
53 """Test that XDG_DATA_HOME is handled correctly."""59 """Test that XDG_DATA_HOME is handled correctly."""
54 self.tweak_env('XDG_DATA_HOME', os.path.abspath(os.path.join(60 self.tweak_env('XDG_DATA_HOME',
55 os.getcwd(), '_trial_temp', 'xdg_data')))61 os.path.abspath(os.path.join(os.getcwd(),
62 '_trial_temp',
63 'xdg_data')))
56 self.tweak_env('XDG_DATA_DIRS', os.pathsep.join(['foo', 'bar']))64 self.tweak_env('XDG_DATA_DIRS', os.pathsep.join(['foo', 'bar']))
57 self.assertEqual([os.environ['XDG_DATA_HOME'].encode('utf-8'),65 self.assertEqual([os.environ['XDG_DATA_HOME'].encode('utf-8'),
58 b'foo', b'bar'],66 b'foo', b'bar'],
@@ -60,8 +68,10 @@
6068
61 def test_data_home(self):69 def test_data_home(self):
62 """Test that XDG_DATA_HOME is handled correctly."""70 """Test that XDG_DATA_HOME is handled correctly."""
63 self.tweak_env('XDG_DATA_HOME', os.path.abspath(os.path.join(71 self.tweak_env('XDG_DATA_HOME',
64 os.getcwd(), '_trial_temp', 'xdg_data')))72 os.path.abspath(os.path.join(os.getcwd(),
73 '_trial_temp',
74 'xdg_data')))
65 self.assertEqual(os.environ['XDG_DATA_HOME'].encode('utf-8'),75 self.assertEqual(os.environ['XDG_DATA_HOME'].encode('utf-8'),
66 basedir.get_xdg_data_home())76 basedir.get_xdg_data_home())
6777
6878
=== 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 @@
87 self.assertEqual(87 self.assertEqual(
88 special_folders['Local AppData'],88 special_folders['Local AppData'],
89 shell_module.values[FakeShellConModule.CSIDL_LOCAL_APPDATA])89 shell_module.values[FakeShellConModule.CSIDL_LOCAL_APPDATA])
90 self.assertTrue(special_folders['Local AppData'].startswith(90 self.assertTrue(
91 special_folders['Local AppData'].startswith(
91 special_folders['AppData']))92 special_folders['AppData']))
92 self.assertEqual(93 self.assertEqual(
93 special_folders['Common AppData'],94 special_folders['Common AppData'],
9495
=== 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 @@
17"""Setup and install dirspec."""17"""Setup and install dirspec."""
18from setuptools import setup18from setuptools import setup
1919
20setup(20setup(name='dirspec',
21 name='dirspec',21 version='4.3',
22 version='4.3',22 description='XDG Base and User directories implementation',
23 description='XDG Base and User directories implementation',23 license='GNU LGPL v3',
24 license='GNU LGPL v3',24 url='https://launchpad.net/dirspec',
25 url='https://launchpad.net/dirspec',25 download_url='https://launchpad.net/dirspec/+download',
26 download_url='https://launchpad.net/dirspec/+download',26 packages=['dirspec'],
27 packages=['dirspec'],27 test_suite='dirspec.tests',
28 test_suite='dirspec.tests',28 )
29 )

Subscribers

People subscribed via source and target branches

to all changes: