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
161
    def __eq__(self, other):
161
    def __eq__(self, other):
6
162
        if isinstance(other, DirEntry):
162
        if isinstance(other, DirEntry):
7
163
            return self.name == other.name and \
163
            return self.name == other.name and \
11
164
                   self.utf8_name == other.utf8_name and \
164
                self.utf8_name == other.utf8_name and \
12
165
                   self.node_type == other.node_type and \
165
                self.node_type == other.node_type and \
13
166
                   self.uuid == other.uuid
166
                self.uuid == other.uuid
14
167
        else:
167
        else:
15
168
            return False
168
            return False
16
169
169
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
233
                    self.requests[message.id].error(e)
233
                    self.requests[message.id].error(e)
22
234
            else:
234
            else:
23
235
                name = protocol_pb2.Message.DESCRIPTOR \
235
                name = protocol_pb2.Message.DESCRIPTOR \
26
236
                     .enum_types_by_name['MessageType'] \
236
                    .enum_types_by_name['MessageType'] \
27
237
                     .values_by_number[message.type].name
237
                    .values_by_number[message.type].name
28
238
238
29
239
                handler = getattr(self, "handle_" + name, None)
239
                handler = getattr(self, "handle_" + name, None)
30
240
                if handler is not None:
240
                if handler is not None:
Status:	Merged
Approved by:	dobey on 2013-05-21
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mike McCracken (community)		2013-05-21	Approve on 2013-05-21
Review via email: mp+164956@code.launchpad.net
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	161	def __eq__(self, other):	161	def __eq__(self, other):
6	162	if isinstance(other, DirEntry):	162	if isinstance(other, DirEntry):
7	163	return self.name == other.name and \	163	return self.name == other.name and \
11	164	self.utf8_name == other.utf8_name and \	164	self.utf8_name == other.utf8_name and \
12	165	self.node_type == other.node_type and \	165	self.node_type == other.node_type and \
13	166	self.uuid == other.uuid	166	self.uuid == other.uuid
14	167	else:	167	else:
15	168	return False	168	return False
16	169		169
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	233	self.requests[message.id].error(e)	233	self.requests[message.id].error(e)
22	234	else:	234	else:
23	235	name = protocol_pb2.Message.DESCRIPTOR \	235	name = protocol_pb2.Message.DESCRIPTOR \
26	236	.enum_types_by_name['MessageType'] \	236	.enum_types_by_name['MessageType'] \
27	237	.values_by_number[message.type].name	237	.values_by_number[message.type].name
28	238		238
29	239	handler = getattr(self, "handle_" + name, None)	239	handler = getattr(self, "handle_" + name, None)
30	240	if handler is not None:	240	if handler is not None: