Glance

Merge lp:~jk0/glance/pep8 into lp:~hudson-openstack/glance/trunk

  1. pep8
  2. Merge into trunk
Proposed by Josh Kearney
Status: Merged
Approved by: Jay Pipes
Approved revision: 53
Merged at revision: 54
Proposed branch: lp:~jk0/glance/pep8
Merge into: lp:~hudson-openstack/glance/trunk
Diff against target: 94 lines (+11/-11)
4 files modified
doc/source/conf.py (+2/-2)
tests/stubs.py (+3/-2)
tests/unit/test_clients.py (+3/-3)
tests/unit/test_stores.py (+3/-4)
To merge this branch: bzr merge lp:~jk0/glance/pep8
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Rick Harris (community) Approve
Review via email: mp+47556@code.launchpad.net

Commit message

PEP8 cleanup.

To post a comment you must log in.
Revision history for this message
Rick Harris (rconradharris) wrote :

lgtm

review: Approve
Revision history for this message
Jay Pipes (jaypipes) wrote :

Cool.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/conf.py'
2--- doc/source/conf.py 2011-01-26 16:01:48 +0000
3+++ doc/source/conf.py 2011-01-26 16:54:54 +0000
4@@ -118,9 +118,9 @@
5 # A list of ignored prefixes for module index sorting.
6 modindex_common_prefix = ['glance.']
7
8-# -- Options for man page output -----------------------------------------------
9+# -- Options for man page output ----------------------------------------------
10
11-# Grouping the document tree for man pages.
12+# Grouping the document tree for man pages.
13 # List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual'
14
15 man_pages = [
16
17=== modified file 'tests/stubs.py'
18--- tests/stubs.py 2011-01-20 20:27:41 +0000
19+++ tests/stubs.py 2011-01-26 16:54:54 +0000
20@@ -117,6 +117,7 @@
21
22 class FakeSwiftAuth(object):
23 pass
24+
25 class FakeS3Connection(object):
26 pass
27
28@@ -134,8 +135,8 @@
29
30 def chunk_it():
31 for i in xrange(0, len(cls.DATA), cls.CHUNK_SIZE):
32- yield cls.DATA[i:i+cls.CHUNK_SIZE]
33-
34+ yield cls.DATA[i:i + cls.CHUNK_SIZE]
35+
36 return chunk_it()
37
38 fake_swift_backend = FakeS3Backend()
39
40=== modified file 'tests/unit/test_clients.py'
41--- tests/unit/test_clients.py 2011-01-18 17:58:23 +0000
42+++ tests/unit/test_clients.py 2011-01-26 16:54:54 +0000
43@@ -388,7 +388,7 @@
44 'is_public': True,
45 'type': 'kernel'
46 }
47-
48+
49 image_meta = self.client.add_image(fixture)
50 self.assertEquals('queued', image_meta['status'])
51 self.assertEquals(0, image_meta['size'])
52@@ -401,7 +401,7 @@
53 'size': 19,
54 'location': "file:///tmp/glance-tests/2",
55 }
56-
57+
58 new_image = self.client.add_image(fixture)
59 new_image_id = new_image['id']
60
61@@ -434,7 +434,7 @@
62 'location': "file:///tmp/glance-tests/2",
63 'properties': {'distro': 'Ubuntu 10.04 LTS'}
64 }
65-
66+
67 new_image = self.client.add_image(fixture)
68 new_image_id = new_image['id']
69
70
71=== modified file 'tests/unit/test_stores.py'
72--- tests/unit/test_stores.py 2011-01-14 19:32:52 +0000
73+++ tests/unit/test_stores.py 2011-01-26 16:54:54 +0000
74@@ -96,17 +96,16 @@
75 def test_get(self):
76 s3_uri = "s3://user:password@localhost/bucket1/file.tar.gz"
77
78- expected_returns = ['I ', 'am', ' a', ' t', 'ea', 'po', 't,', ' s',
79+ expected_returns = ['I ', 'am', ' a', ' t', 'ea', 'po', 't,', ' s',
80 'ho', 'rt', ' a', 'nd', ' s', 'to', 'ut', '\n']
81- fetcher = get_from_backend(s3_uri,
82- expected_size=8,
83+ fetcher = get_from_backend(s3_uri,
84+ expected_size=8,
85 conn_class=S3Backend)
86
87 chunks = [c for c in fetcher]
88 self.assertEqual(chunks, expected_returns)
89
90
91-
92 class TestSwiftBackend(TestBackend):
93
94 def setUp(self):

Subscribers

People subscribed via source and target branches