Merge lp:~james-w/launchpad/move-file-is-a-directory into lp:launchpad
Status: | Merged |
---|---|
Merged at revision: | 11148 |
Proposed branch: | lp:~james-w/launchpad/move-file-is-a-directory |
Merge into: | lp:launchpad |
Diff against target: |
107 lines (+16/-13) 5 files modified
lib/lp/codehosting/sftp.py (+1/-10) lib/lp/codehosting/tests/test_sftp.py (+2/-1) lib/lp/poppy/tests/test_twistedsftp.py (+1/-1) lib/lp/poppy/twistedsftp.py (+1/-1) lib/lp/services/sshserver/sftp.py (+11/-0) |
To merge this branch: | bzr merge lp:~james-w/launchpad/move-file-is-a-directory |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Hummer (community) | code | Approve | |
Review via email: mp+29033@code.launchpad.net |
Commit message
Make poppy stop depending on codehosting by moving FileIsADirectory to lp.services.
Description of the change
Hi,
This is a small branch to stop lp.poppy depending on lp.codehosting.
There's no real need for this soyuzy thing to depend on codehosting, it
was just convenience of reusing an error.
It has the slightly unfortunate side-effects of making lp.codehosting.sftp
depend on lp.services.
however those dependencies are at least in the right direction.
Tests:
./bin/test -s lp.poppy
./bin/test -s lp.codehosting.
Linting changed files:
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
== Pyflakes notices ==
lib/lp/
19: 'zope' imported but unused
'import site' failed; use -v for traceback
Exception RuntimeError: 'maximum recursion depth exceeded while calling a Python object' in <type 'exceptions.
Exception RuntimeError: 'maximum recursion depth exceeded while calling a Python object' in <type 'exceptions.
Exception RuntimeError: 'maximum recursion depth exceeded in __subclasscheck__' in <type 'exceptions.
Exception RuntimeError: 'maximum recursion depth exceeded in __subclasscheck__' in <type 'exceptions.
== Pylint notices ==
lib/lp/
19: [W0611] Unused import zope
lib/lp/
19: [E1002, TestSFTPServer.
Thanks,
James
A big +1 from me!