Rev 1256: Remove unused imports. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1256
revision-id: jelmer at samba.org-20080622073715-ygjbmezdws9aru0i
parent: jelmer at samba.org-20080622072225-p8pu2abk18l72gp1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-22 09:37:15 +0200
message:
  Remove unused imports.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
  tests/test_repos.py            test_repos.py-20060508151940-ddc49a59257ca712
=== modified file '__init__.py'
--- a/__init__.py	2008-06-21 21:47:34 +0000
+++ b/__init__.py	2008-06-22 07:37:15 +0000
@@ -68,6 +68,10 @@
     """Check that Subversion is compatible.
 
     """
+    try:
+        from bzrlib.plugins.svn import core
+    except:
+        warning("Unable to load bzr-svn extensions - did you build it?")
     from bzrlib.plugins.svn.ra import version
     ra_version = version()
     if (ra_version[0] >= 5 and getattr(ra, 'SVN_REVISION', None) and 27729 <= ra.SVN_REVISION < 31470):

=== modified file 'branch.py'
--- a/branch.py	2008-06-22 06:04:20 +0000
+++ b/branch.py	2008-06-22 07:37:15 +0000
@@ -24,8 +24,6 @@
 from bzrlib.revision import is_null, ensure_null, NULL_REVISION
 from bzrlib.workingtree import WorkingTree
 
-import svn.core
-
 from bzrlib.plugins.svn import core
 from bzrlib.plugins.svn.auth import create_auth_baton
 from bzrlib.plugins.svn.client import Client, get_config

=== modified file 'fetch.py'
--- a/fetch.py	2008-06-22 04:40:01 +0000
+++ b/fetch.py	2008-06-22 07:37:15 +0000
@@ -40,8 +40,6 @@
 from bzrlib.plugins.svn.tree import (parse_externals_description, 
                   inventory_add_external)
 
-import svn.delta
-
 def _escape_commit_message(message):
     """Replace xml-incompatible control characters."""
     if message is None:

=== modified file 'format.py'
--- a/format.py	2008-06-21 16:42:58 +0000
+++ b/format.py	2008-06-22 07:37:15 +0000
@@ -125,12 +125,8 @@
         raise bzr_errors.NotBranchError(path=transport.base)
 
     def _open(self, transport):
-        import svn.core
         from workingtree import SvnCheckout
         from bzrlib.plugins.svn import core
-        subr_version = svn.core.svn_subr_version()
-        if subr_version.major == 1 and subr_version.minor < 4:
-            raise errors.NoCheckoutSupport()
         try:
             return SvnCheckout(transport, self)
         except core.SubversionException, (_, num):

=== modified file 'logwalker.py'
--- a/logwalker.py	2008-06-22 07:22:25 +0000
+++ b/logwalker.py	2008-06-22 07:37:15 +0000
@@ -20,8 +20,6 @@
 from bzrlib.trace import mutter
 import bzrlib.ui as ui
 
-import svn.delta
-
 from bzrlib.plugins.svn import changes, core
 from bzrlib.plugins.svn.cache import CacheTable
 from bzrlib.plugins.svn.core import SubversionException

=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py	2008-06-05 10:21:04 +0000
+++ b/tests/test_convert.py	2008-06-22 07:37:15 +0000
@@ -31,8 +31,6 @@
 from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
 from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
-import svn.repos
-
 class TestLoadDumpfile(TestCaseInTempDir):
     def test_loaddumpfile(self):
         dumpfile = os.path.join(self.test_dir, "dumpfile")

=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py	2008-06-22 04:51:45 +0000
+++ b/tests/test_repos.py	2008-06-22 07:37:15 +0000
@@ -31,8 +31,6 @@
 
 import os, sys
 
-import svn.fs
-
 from bzrlib.plugins.svn import format, ra
 from bzrlib.plugins.svn.mapping import (escape_svn_path, unescape_svn_path, 
                      SVN_PROP_BZR_REVISION_ID)