Merge lp:~james-w/launchpad/move-file-is-a-directory into lp:launchpad

[James Westby]

Make poppy stop depending on codehosting by moving FileIsADirectory to lp.services.sshserver

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.sshserver, and lp.services.sshserver depend on bzr,
however those dependencies are at least in the right direction.

Tests:
./bin/test -s lp.poppy
./bin/test -s lp.codehosting.tests -m test_sftp

Linting changed files:
  lib/lp/codehosting/sftp.py
  lib/lp/codehosting/tests/test_sftp.py
  lib/lp/poppy/twistedsftp.py
  lib/lp/poppy/tests/test_twistedsftp.py
  lib/lp/services/sshserver/sftp.py

== Pyflakes notices ==

lib/lp/poppy/twistedsftp.py
    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.RuntimeError'> ignored
Exception RuntimeError: 'maximum recursion depth exceeded while calling a Python object' in <type 'exceptions.RuntimeError'> ignored
Exception RuntimeError: 'maximum recursion depth exceeded in __subclasscheck__' in <type 'exceptions.AttributeError'> ignored
Exception RuntimeError: 'maximum recursion depth exceeded in __subclasscheck__' in <type 'exceptions.AttributeError'> ignored

== Pylint notices ==

lib/lp/poppy/twistedsftp.py
    19: [W0611] Unused import zope

lib/lp/poppy/tests/test_twistedsftp.py
    19: [E1002, TestSFTPServer.setUp] Use super on an old style class

Thanks,

James

[Paul Hummer (rockstar)]

A big +1 from me!

review: Approve (code)

=== modified file 'lib/lp/codehosting/sftp.py'
--- lib/lp/codehosting/sftp.py	2010-05-28 08:42:47 +0000
+++ lib/lp/codehosting/sftp.py	2010-07-16 19:49:41 +0000
@@ -16,7 +16,6 @@
 __all__ = [
     'avatar_to_sftp_server',
     'TransportSFTPServer',
-    'FileIsADirectory',
     ]
 
 
@@ -38,18 +37,10 @@
 
 from canonical.config import config
 from lp.codehosting.vfs import AsyncLaunchpadTransport, LaunchpadServer
+from lp.services.sshserver.sftp import FileIsADirectory
 from lp.services.twistedsupport import gatherResults
 
 
-class FileIsADirectory(bzr_errors.PathError):
-    """Raised when writeChunk is called on a directory.
-
-    This exists mainly to be translated into the appropriate SFTP error.
-    """
-
-    _fmt = 'File is a directory: %(path)r%(extra)s'
-
-
 class FatLocalTransport(LocalTransport):
     """A Bazaar transport that also implements writeChunk and local_realPath.
 

=== modified file 'lib/lp/codehosting/tests/test_sftp.py'
--- lib/lp/codehosting/tests/test_sftp.py	2010-04-19 10:56:23 +0000
+++ lib/lp/codehosting/tests/test_sftp.py	2010-07-16 19:49:41 +0000
@@ -24,8 +24,9 @@
 
 from lp.codehosting.inmemory import InMemoryFrontend, XMLRPCWrapper
 from lp.codehosting.sftp import (
-    FatLocalTransport, TransportSFTPServer, FileIsADirectory)
+    FatLocalTransport, TransportSFTPServer)
 from lp.codehosting.sshserver.daemon import CodehostingAvatar
+from lp.services.sshserver.sftp import FileIsADirectory
 from lp.testing.factory import LaunchpadObjectFactory
 from canonical.testing.layers import TwistedLayer
 

=== modified file 'lib/lp/poppy/tests/test_twistedsftp.py'
--- lib/lp/poppy/tests/test_twistedsftp.py	2010-05-28 12:35:42 +0000
+++ lib/lp/poppy/tests/test_twistedsftp.py	2010-07-16 19:49:41 +0000
@@ -9,8 +9,8 @@
 import tempfile
 import unittest
 
-from lp.codehosting.sftp import FileIsADirectory
 from lp.poppy.twistedsftp import SFTPServer
+from lp.services.sshserver.sftp import FileIsADirectory
 from lp.testing import TestCase
 
 

=== modified file 'lib/lp/poppy/twistedsftp.py'
--- lib/lp/poppy/twistedsftp.py	2010-05-28 12:35:42 +0000
+++ lib/lp/poppy/twistedsftp.py	2010-07-16 19:49:41 +0000
@@ -19,10 +19,10 @@
 import zope.component.event
 from zope.interface import implements
 
-from lp.codehosting.sftp import FileIsADirectory
 from lp.poppy.filesystem import UploadFileSystem
 from lp.poppy.hooks import Hooks
 from lp.services.sshserver.events import SFTPClosed
+from lp.services.sshserver.sftp import FileIsADirectory
 
 
 class SFTPServer:

=== modified file 'lib/lp/services/sshserver/sftp.py'
--- lib/lp/services/sshserver/sftp.py	2010-04-15 15:49:05 +0000
+++ lib/lp/services/sshserver/sftp.py	2010-07-16 19:49:41 +0000
@@ -5,9 +5,11 @@
 
 __metaclass__ = type
 __all__ = [
+    'FileIsADirectory',
     'FileTransferServer',
     ]
 
+from bzrlib import errors as bzr_errors
 from twisted.conch.ssh import filetransfer
 
 from zope.event import notify
@@ -15,6 +17,15 @@
 from lp.services.sshserver import events
 
 
+class FileIsADirectory(bzr_errors.PathError):
+    """Raised when writeChunk is called on a directory.
+
+    This exists mainly to be translated into the appropriate SFTP error.
+    """
+
+    _fmt = 'File is a directory: %(path)r%(extra)s'
+
+
 class FileTransferServer(filetransfer.FileTransferServer):
     """SFTP protocol implementation that logs key events."""