Ubuntu One storage protocol

Merge lp:~dobey/ubuntuone-storage-protocol/new-pep8 into lp:ubuntuone-storage-protocol

  1. new-pep8
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 159
Merged at revision: 159
Proposed branch: lp:~dobey/ubuntuone-storage-protocol/new-pep8
Merge into: lp:ubuntuone-storage-protocol
Diff against target: 30 lines (+5/-5)
2 files modified
ubuntuone/storageprotocol/dircontent.py (+3/-3)
ubuntuone/storageprotocol/request.py (+2/-2)
To merge this branch: bzr merge lp:~dobey/ubuntuone-storage-protocol/new-pep8
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+164956@code.launchpad.net

Commit message

Fix issues reported by pep8 1.4.4.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/storageprotocol/dircontent.py'
2--- ubuntuone/storageprotocol/dircontent.py 2012-03-29 20:28:09 +0000
3+++ ubuntuone/storageprotocol/dircontent.py 2013-05-21 17:24:27 +0000
4@@ -161,8 +161,8 @@
5 def __eq__(self, other):
6 if isinstance(other, DirEntry):
7 return self.name == other.name and \
8- self.utf8_name == other.utf8_name and \
9- self.node_type == other.node_type and \
10- self.uuid == other.uuid
11+ self.utf8_name == other.utf8_name and \
12+ self.node_type == other.node_type and \
13+ self.uuid == other.uuid
14 else:
15 return False
16
17=== modified file 'ubuntuone/storageprotocol/request.py'
18--- ubuntuone/storageprotocol/request.py 2012-03-29 20:28:09 +0000
19+++ ubuntuone/storageprotocol/request.py 2013-05-21 17:24:27 +0000
20@@ -233,8 +233,8 @@
21 self.requests[message.id].error(e)
22 else:
23 name = protocol_pb2.Message.DESCRIPTOR \
24- .enum_types_by_name['MessageType'] \
25- .values_by_number[message.type].name
26+ .enum_types_by_name['MessageType'] \
27+ .values_by_number[message.type].name
28
29 handler = getattr(self, "handle_" + name, None)
30 if handler is not None:

Subscribers

People subscribed via source and target branches