Rev 1089: Fix imports. in file:///data/jelmer/bzr-svn/cext/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/cext/

------------------------------------------------------------
revno: 1089
revision-id: jelmer at samba.org-20080605182219-vhyspz3s1g3b042r
parent: jelmer at samba.org-20080605180834-3nsygejr7vqmkdvs
parent: jelmer at samba.org-20080605182131-f211zu91glaq9hp2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Thu 2008-06-05 20:22:19 +0200
message:
  Fix imports.
modified:
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 950.3.155
    revision-id: jelmer at samba.org-20080605182131-f211zu91glaq9hp2
    parent: jelmer at samba.org-20080605175439-4qlkiutmdxkgh1o7
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-06-05 20:21:31 +0200
    message:
      Fix imports.
    modified:
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      tests/test_errors.py           test_errors.py-20070129114605-ban03f32t6ja14ez-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-06-05 18:08:34 +0000
+++ b/mapping3/__init__.py	2008-06-05 18:22:19 +0000
@@ -17,6 +17,7 @@
 from bzrlib.errors import InvalidRevisionId
 from bzrlib.trace import mutter
 from bzrlib.plugins.svn import core, mapping, properties
+from bzrlib.plugins.svn.core import SubversionException
 from bzrlib.plugins.svn.errors import ERR_FS_NOT_DIRECTORY, ERR_FS_NOT_FOUND
 from bzrlib.plugins.svn.layout import RepositoryLayout
 from bzrlib.plugins.svn.mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path, 

=== modified file 'repository.py'
--- a/repository.py	2008-06-05 18:08:34 +0000
+++ b/repository.py	2008-06-05 18:22:19 +0000
@@ -378,7 +378,7 @@
         try:
             return (core.NODE_DIR == self.transport.check_path(path, revnum))
         except SubversionException, (_, num):
-            if num == ERR_FS_NO_SUCH_REVISION:
+            if num == errors.ERR_FS_NO_SUCH_REVISION:
                 return False
             raise
 

=== modified file 'transport.py'
--- a/transport.py	2008-06-05 18:08:34 +0000
+++ b/transport.py	2008-06-05 18:22:19 +0000
@@ -25,7 +25,7 @@
 from bzrlib.plugins.svn.auth import create_auth_baton
 
 from bzrlib.plugins.svn import core, properties, ra
-from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND
+from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND, ERR_FS_NOT_DIRECTORY
 import urlparse
 import urllib