Ubuntu One storage protocol

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

  1. fix-pep8
  2. Merge into trunk
Proposed by dobey on 2012-06-26
Status: Merged
Approved by: Roberto Alsina on 2012-06-26
Approved revision: 151
Merged at revision: 151
Proposed branch: lp:~dobey/ubuntuone-storage-protocol/fix-pep8
Merge into: lp:ubuntuone-storage-protocol
Diff against target: 26 lines (+3/-3)
2 files modified
tests/test_dircontent.py (+1/-1)
ubuntuone/storageprotocol/client.py (+2/-2)
To merge this branch: bzr merge lp:~dobey/ubuntuone-storage-protocol/fix-pep8
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-06-26 Approve on 2012-06-26
Review via email: mp+111986@code.launchpad.net

Commit Message

Fix some small pep8 errors

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_dircontent.py'
2--- tests/test_dircontent.py 2012-03-29 20:28:09 +0000
3+++ tests/test_dircontent.py 2012-06-26 01:53:19 +0000
4@@ -96,7 +96,7 @@
5 self.assert_(a == a)
6 self.assert_(a == a2)
7 self.assert_(a != b)
8- self.assert_(a != None)
9+ self.assert_(a is not None)
10
11 def testEntryName(self):
12 """Verify that name and utf8_name are encoded and decoded properly."""
13
14=== modified file 'ubuntuone/storageprotocol/client.py'
15--- ubuntuone/storageprotocol/client.py 2012-03-29 20:28:09 +0000
16+++ ubuntuone/storageprotocol/client.py 2012-06-26 01:53:19 +0000
17@@ -1730,8 +1730,8 @@
18 """
19 delayed_call = getattr(self, call_id)
20 # check if we already have a DelayedCall running
21- if delayed_call is None or (not delayed_call.active() \
22- and delayed_call.cancelled):
23+ if delayed_call is None or (not delayed_call.active()
24+ and delayed_call.cancelled):
25 return self.callLater(period, func)
26 return delayed_call
27

Subscribers

People subscribed via source and target branches