Merge lp:~brian.curtin/ubuntuone-client/upoad-spellcheck into lp:ubuntuone-client

Proposed by Brian Curtin on 2012-03-15
Status: Work in progress
Proposed branch: lp:~brian.curtin/ubuntuone-client/upoad-spellcheck
Merge into: lp:ubuntuone-client
Diff against target: 46 lines (+16/-2)
2 files modified
ubuntuone/syncdaemon/interaction_interfaces.py (+1/-1)
ubuntuone/syncdaemon/tunnel_runner.py (+15/-1)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-client/upoad-spellcheck
Reviewer Review Type Date Requested Status
Natalia Bidart Needs Fixing on 2012-03-15
dobey (community) 2012-03-15 Approve on 2012-03-15
Review via email: mp+97656@code.launchpad.net

Commit message

Correct spelling of "upload" (from "upoad") in a keyword argument.

Description of the change

Spelling change on keyword argument: upoad to upLoad

FWIW, nothing seems affected by this change when running the tests. I just noticed the spelling error and fixed it since it's actually in usable code.

To post a comment you must log in.
dobey (dobey) :
review: Approve
Natalia Bidart (nataliabidart) wrote :

Brian,

can you please add a test that will fail with this typo?

Thanks a lot!

review: Needs Fixing
1209. By Brian Curtin on 2012-03-16

Give reactor.spawnProcess a process_path and args that will work on win32

1210. By Brian Curtin on 2012-03-16

Put TUNNEL_EXECUTABLE back in so Linux doesn't break

Unmerged revisions

1210. By Brian Curtin on 2012-03-16

Put TUNNEL_EXECUTABLE back in so Linux doesn't break

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
2--- ubuntuone/syncdaemon/interaction_interfaces.py 2012-03-01 19:08:12 +0000
3+++ ubuntuone/syncdaemon/interaction_interfaces.py 2012-03-19 14:00:46 +0000
4@@ -841,7 +841,7 @@
5 """Handle AQ_UPLOAD_ERROR."""
6 self._path_from_ids(share_id, node_id, 'UploadFinished',
7 info=dict(error=str(error)),
8- error_info=dict(upoad_error=str(error)))
9+ error_info=dict(upload_error=str(error)))
10
11 @log_call(logger.debug)
12 def handle_SV_ACCOUNT_CHANGED(self, account_info):
13
14=== modified file 'ubuntuone/syncdaemon/tunnel_runner.py'
15--- ubuntuone/syncdaemon/tunnel_runner.py 2012-03-12 17:42:57 +0000
16+++ ubuntuone/syncdaemon/tunnel_runner.py 2012-03-19 14:00:46 +0000
17@@ -16,6 +16,7 @@
18 """Run the tunnel process and start a client, with a reactor as a fallback."""
19
20 import logging
21+import sys
22
23 from os import path
24
25@@ -43,7 +44,20 @@
26 from ubuntuone.proxy.tunnel_client import TunnelProcessProtocol
27 protocol = TunnelProcessProtocol(self.client_d)
28 process_path = self.get_process_path()
29- args = [TUNNEL_EXECUTABLE, host, str(port)]
30+ args = [host, str(port)]
31+
32+ if sys.platform == "win32" and not hasattr(sys, "frozen"):
33+ # On Windows we can't start TUNNEL_EXECUTABLE directly.
34+ # Start a Python interpreter with TUNNEL_EXECUTABLE inserted
35+ # as the first argument, with its arguments following.
36+ args = [process_path,] + args
37+ process_path = sys.executable
38+ elif hasattr(sys, "frozen"):
39+ # Frozen, in a Windows build start the executable.
40+ process_path = os.path.join(sys.prefix, TUNNEL_EXECUTABLE+".exe")
41+ else:
42+ args = [TUNNEL_EXECUTABLE,] + args
43+
44 reactor.spawnProcess(protocol, process_path, env=None, args=args)
45
46 def get_process_path(self):

Subscribers

People subscribed via source and target branches