Update code for compatibility with Python 3

[m_librarian.git] / tests / __init__.py

diff --git a/tests/__init__.py b/tests/__init__.py
index c624381b6ad0e053f6cf370b1ea16d3b67df18dc..e55661f9673427fac81535862bee5987575a2d24 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,10 +1,10 @@
 
-__all__ = ['TestCase', 'main']
-
-
 import os
 import unittest
 from m_librarian.db import open_db, init_db
+from m_librarian.inp import import_inpx
+
+__all__ = ['TestCase', 'main']
 
 
 class TestCase(unittest.TestCase):
@@ -22,11 +22,14 @@ class TestCase(unittest.TestCase):
         except OSError:
             pass
 
+    def import_inpx(self, inpx):
+        import_inpx(os.path.join(os.path.dirname(__file__), inpx))
+
 
 def main():
     try:
         unittest.main(testRunner=unittest.TextTestRunner())
-    except SystemExit, msg:
+    except SystemExit as msg:
         result = msg.args[0]
     else:
         result = 0