Fix 'make test' for python3

pwman/tests/__init__.py

@@ -1,12 +1,12 @@
 from . import test_pwman
 
+
 def suite():
     import unittest
-    #import doctest
     suite = unittest.TestSuite()
-    #suite.addTests(doctest.DocTestSuite(helloworld))
     suite.addTests(test_pwman.suite())
     return suite
 
+
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite())

pwman/tests/db_tests.py

@@ -73,8 +73,8 @@ _saveconfig = False
 PwmanCliNew, OSX = get_ui_platform(sys.platform)
 
 
-from test_tools import (SetupTester, DummyCallback2,
-                        DummyCallback3, DummyCallback4)
+from .test_tools import (SetupTester, DummyCallback2,
+                         DummyCallback3, DummyCallback4)
 
 
 class DBTests(unittest.TestCase):

pwman/tests/test_pwman.py

@@ -21,14 +21,14 @@
 import os
 import sys
 import unittest
-from db_tests import (DBTests, SetupTester, CLITests, ConfigTest,
+from .db_tests import (DBTests, SetupTester, CLITests, ConfigTest,
                        TestDBFalseConfig, FactoryTest)
 
 #from .crypto_tests import CryptoTest
-from test_crypto_engine import CryptoEngineTest
+from .test_crypto_engine import CryptoEngineTest
 
 if 'win' not in sys.platform:
-    from test_complete_ui import Ferrum, NEW_DB_PATH
+    from .test_complete_ui import (Ferrum, NEW_DB_PATH)
 
     if os.path.exists(NEW_DB_PATH):
         os.remove(NEW_DB_PATH)

setup.py

@@ -11,6 +11,8 @@ from subprocess import Popen, PIPE
 from build_manpage import BuildManPage
 import pwman
 
+sys.path.insert(0, os.getcwd())
+
 
 def describe():
     des = Popen('git describe', shell=True, stdout=PIPE)
@@ -81,7 +83,7 @@ setup(name=pwman.appname,
           'Programming Language :: Python :: 2.7'
       ],
       test_suite='pwman.tests.suite',
-      tests_require=test_requirements, 
+      tests_require=test_requirements,
       cmdclass={
           'install_pycrypto': PyCryptoInstallCommand,
           'build_manpage': BuildManPage