ソースを参照

Fix failing test 3.4.2

oz123 10 年 前
コミット
954a63779c
2 ファイル変更7 行追加4 行削除
  1. 1 1
      pwman/data/drivers/postgresql.py
  2. 6 3
      pwman/tests/test_importer.py

+ 1 - 1
pwman/data/drivers/postgresql.py

@@ -22,7 +22,7 @@
 """Postgresql Database implementation."""
 import sys
 if sys.version_info.major > 2:  # pragma: no cover
-    from urllib import parse as urlparse
+    from urllib.parse import urlparse
 else:
     from urlparse import urlparse
 import psycopg2 as pg

+ 6 - 3
pwman/tests/test_importer.py

@@ -36,8 +36,9 @@ class TestImporter(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        with open('import_file.csv', 'w') as f:
-            f.write(import_example)
+        f = open('import_file.csv', 'w')
+        f.write(import_example)
+        f.close()
 
     @classmethod
     def tearDownClass(cls):
@@ -91,7 +92,9 @@ class TestImporter(unittest.TestCase):
         Args = namedtuple('Args', 'import_file, db')
         if os.path.exists('importdummy.db'):
             os.unlink('importdummy.db')
-        args = Args(import_file=open('import_file.csv'), db='importdummy.db')
+        f = open('import_file.csv')
+        args = Args(import_file=f, db='importdummy.db')
+        f.close()
         dbtype, dbver, fname = 'SQLite', 0.6, 'importdummy.db'
         db = pwman.data.factory.create(dbtype, dbver, fname)
         importer = Importer((args, '', db))