Merge fixes from 0.3 branch.

[jelmer/subvertpy.git] / __init__.py

diff --git a/__init__.py b/__init__.py
index 60f693d97cc7bd2a540b0ae7a91195024091b68a..1cadbb9b6651a0d24da42b79557a21bc092db16c 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -22,8 +22,14 @@ import sys
 import unittest
 import bzrlib
 
+try:
+    from bzrlib.trace import warning
+except ImportError:
+    # get the message out any way we can
+    from warnings import warn as warning
+
 __version__ = '0.3.1'
-required_bzr_version = (0,14)
+required_bzr_version = (0,15)
 
 def check_bzrlib_version(desired):
     """Check that bzrlib is compatible.
@@ -37,11 +43,6 @@ def check_bzrlib_version(desired):
     bzrlib_version = bzrlib.version_info[:2]
     if bzrlib_version == desired:
         return
-    try:
-        from bzrlib.trace import warning
-    except ImportError:
-        # get the message out any way we can
-        from warnings import warn as warning
     if bzrlib_version < desired:
         warning('Installed bzr version %s is too old to be used with bzr-svn'
                 ' %s.' % (bzrlib.__version__, __version__))
@@ -58,7 +59,6 @@ def check_subversion_version():
     """Check that Subversion is compatible.
 
     """
-    from bzrlib.trace import warning
     try:
         from svn.delta import svn_delta_invoke_txdelta_window_handler
     except:
@@ -69,7 +69,6 @@ def check_pysqlite_version():
     """Check that sqlite library is compatible.
 
     """
-    from bzrlib.trace import warning
     try:
         try:
             import sqlite3
@@ -201,16 +200,14 @@ register_command(cmd_svn_upgrade)
 def test_suite():
     from unittest import TestSuite, TestLoader
     import tests
-
     suite = TestSuite()
-
     suite.addTest(tests.test_suite())
-
     return suite
 
 if __name__ == '__main__':
     print ("This is a Bazaar plugin. Copy this directory to ~/.bazaar/plugins "
           "to use it.\n")
+    runner = unittest.TextTestRunner()
+    runner.run(test_suite())
 else:
-    sys.path.append(os.path.dirname(__file__))
-
+    sys.path.append(os.path.dirname(os.path.abspath(__file__)))