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

Proposed by dobey on 2012-11-28
Status: Merged
Approved by: dobey on 2012-11-28
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 on 2012-11-28
Alejandro J. Cura (community) 2012-11-28 Approve on 2012-11-28
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.
Alejandro J. Cura (alecu) wrote :

+1

review: Approve
Roberto Alsina (ralsina) :
review: Approve
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
1=== modified file 'dirspec/basedir.py'
2--- dirspec/basedir.py 2012-07-13 18:14:17 +0000
3+++ dirspec/basedir.py 2012-11-28 16:11:34 +0000
4@@ -56,8 +56,8 @@
5 """Get the paths for the XDG config directories."""
6 result = [get_xdg_config_home()]
7 result.extend([x.encode('utf-8') for x in get_env_path(
8- 'XDG_CONFIG_DIRS',
9- default_config_path).decode('utf-8').split(os.pathsep)])
10+ 'XDG_CONFIG_DIRS',
11+ default_config_path).decode('utf-8').split(os.pathsep)])
12 return result
13
14
15@@ -65,8 +65,8 @@
16 """Get the paths for the XDG data directories."""
17 result = [get_xdg_data_home()]
18 result.extend([x.encode('utf-8') for x in get_env_path(
19- 'XDG_DATA_DIRS',
20- default_data_path).decode('utf-8').split(os.pathsep)])
21+ 'XDG_DATA_DIRS',
22+ default_data_path).decode('utf-8').split(os.pathsep)])
23 return result
24
25
26
27=== modified file 'dirspec/tests/test_basedir.py'
28--- dirspec/tests/test_basedir.py 2012-07-13 18:14:17 +0000
29+++ dirspec/tests/test_basedir.py 2012-11-28 16:11:34 +0000
30@@ -28,15 +28,19 @@
31
32 def test_cache_home(self):
33 """Test that XDG_CACHE_HOME is handled correctly."""
34- self.tweak_env('XDG_CACHE_HOME', os.path.abspath(os.path.join(
35- os.getcwd(), '_trial_temp', 'cache')))
36+ self.tweak_env('XDG_CACHE_HOME',
37+ os.path.abspath(os.path.join(os.getcwd(),
38+ '_trial_temp',
39+ 'cache')))
40 self.assertEqual(os.environ['XDG_CACHE_HOME'].encode('utf-8'),
41 basedir.get_xdg_cache_home())
42
43 def test_config_dirs(self):
44 """Test that XDG_CONFIG_HOME is handled correctly."""
45- self.tweak_env('XDG_CONFIG_HOME', os.path.abspath(os.path.join(
46- os.getcwd(), '_trial_temp', 'config')))
47+ self.tweak_env('XDG_CONFIG_HOME',
48+ os.path.abspath(os.path.join(os.getcwd(),
49+ '_trial_temp',
50+ 'config')))
51 self.tweak_env('XDG_CONFIG_DIRS', os.pathsep.join(['etc']))
52 self.assertEqual([os.environ['XDG_CONFIG_HOME'].encode('utf-8'),
53 b'etc'],
54@@ -44,15 +48,19 @@
55
56 def test_config_home(self):
57 """Test that XDG_CONFIG_DIRS is handled correctly."""
58- self.tweak_env('XDG_CONFIG_HOME', os.path.abspath(os.path.join(
59- os.getcwd(), '_trial_temp', 'config')))
60+ self.tweak_env('XDG_CONFIG_HOME',
61+ os.path.abspath(os.path.join(os.getcwd(),
62+ '_trial_temp',
63+ 'config')))
64 self.assertEqual(os.environ['XDG_CONFIG_HOME'].encode('utf-8'),
65 basedir.get_xdg_config_home())
66
67 def test_data_dirs(self):
68 """Test that XDG_DATA_HOME is handled correctly."""
69- self.tweak_env('XDG_DATA_HOME', os.path.abspath(os.path.join(
70- os.getcwd(), '_trial_temp', 'xdg_data')))
71+ self.tweak_env('XDG_DATA_HOME',
72+ os.path.abspath(os.path.join(os.getcwd(),
73+ '_trial_temp',
74+ 'xdg_data')))
75 self.tweak_env('XDG_DATA_DIRS', os.pathsep.join(['foo', 'bar']))
76 self.assertEqual([os.environ['XDG_DATA_HOME'].encode('utf-8'),
77 b'foo', b'bar'],
78@@ -60,8 +68,10 @@
79
80 def test_data_home(self):
81 """Test that XDG_DATA_HOME is handled correctly."""
82- self.tweak_env('XDG_DATA_HOME', os.path.abspath(os.path.join(
83- os.getcwd(), '_trial_temp', 'xdg_data')))
84+ self.tweak_env('XDG_DATA_HOME',
85+ os.path.abspath(os.path.join(os.getcwd(),
86+ '_trial_temp',
87+ 'xdg_data')))
88 self.assertEqual(os.environ['XDG_DATA_HOME'].encode('utf-8'),
89 basedir.get_xdg_data_home())
90
91
92=== modified file 'dirspec/tests/test_utils.py'
93--- dirspec/tests/test_utils.py 2012-07-13 19:20:25 +0000
94+++ dirspec/tests/test_utils.py 2012-11-28 16:11:34 +0000
95@@ -87,7 +87,8 @@
96 self.assertEqual(
97 special_folders['Local AppData'],
98 shell_module.values[FakeShellConModule.CSIDL_LOCAL_APPDATA])
99- self.assertTrue(special_folders['Local AppData'].startswith(
100+ self.assertTrue(
101+ special_folders['Local AppData'].startswith(
102 special_folders['AppData']))
103 self.assertEqual(
104 special_folders['Common AppData'],
105
106=== modified file 'setup.py'
107--- setup.py 2012-10-31 18:33:20 +0000
108+++ setup.py 2012-11-28 16:11:34 +0000
109@@ -17,13 +17,12 @@
110 """Setup and install dirspec."""
111 from setuptools import setup
112
113-setup(
114- name='dirspec',
115- version='4.3',
116- description='XDG Base and User directories implementation',
117- license='GNU LGPL v3',
118- url='https://launchpad.net/dirspec',
119- download_url='https://launchpad.net/dirspec/+download',
120- packages=['dirspec'],
121- test_suite='dirspec.tests',
122- )
123+setup(name='dirspec',
124+ version='4.3',
125+ description='XDG Base and User directories implementation',
126+ license='GNU LGPL v3',
127+ url='https://launchpad.net/dirspec',
128+ download_url='https://launchpad.net/dirspec/+download',
129+ packages=['dirspec'],
130+ test_suite='dirspec.tests',
131+ )

Subscribers

People subscribed via source and target branches

to all changes: