From 1240e2a23d979e918636780b4fedbac3745ee199 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 18 Nov 2014 11:58:04 +0100
Subject: [PATCH] cleanup

---
 tests/test_cli.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index 049ee23..55f47c2 100755
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -27,9 +27,6 @@ del os, sys, path
 # --------
 
 
-
-
-
 import os
 import sys
 import shutil
@@ -41,6 +38,7 @@ TEMP_SERVER = "/tmp/bam_test_server"
 PORT = 5555
 PROJECT_NAME = "test_project"
 
+
 def run(cmd, cwd=None):
     # print(">>> ", " ".join(cmd))
     import subprocess
@@ -62,6 +60,7 @@ class CHDir:
         "dir_old",
         "dir_new",
         )
+
     def __init__(self, directory):
         self.dir_old = os.getcwd()
         self.dir_new = directory
@@ -78,6 +77,7 @@ class StdIO:
         "stdout",
         "stderr",
         )
+
     def __init__(self):
         self.stdout = sys.stdout
         self.stderr = sys.stderr
@@ -101,15 +101,18 @@ class StdIO:
 def svn_repo_create(id_, dirname):
     run(["svnadmin", "create", id_], cwd=dirname)
 
+
 def svn_repo_checkout(path):
     run(["svn", "checkout", path])
 
+
 def svn_repo_populate(path):
     dummy_file = os.path.join(path, "file1")
     run(["touch", dummy_file])
     run(["svn", "add", dummy_file])
     run(["svn", "commit", "-m", "First commit"])
 
+
 def bam_run(argv, cwd=None):
 
     with CHDir(cwd):
@@ -120,8 +123,8 @@ def bam_run(argv, cwd=None):
 
     return ret
 
-#if __name__ == "__main__":
-#    main()
+# if __name__ == "__main__":
+#     main()
 
 
 # ------------------------------------------------------------------------------
@@ -132,7 +135,6 @@ def server(mode='testing', debug=False):
     """Start development server via Flask app.run() in a separate thread. We need server
     to run in order to check most of the client commands.
     """
-    import threading
 
     def run_testing_server():
         from application import app
@@ -140,7 +142,7 @@ def server(mode='testing', debug=False):
         # with a testing, disposable one (create TMP dir)
         if mode == 'testing':
             from application import db
-            from application.modules.projects.model import Project, ProjectSetting
+            from application.modules.projects.model import Project
             # Override sqlite database
             if not os.path.isdir(TEMP_SERVER):
                 os.makedirs(TEMP_SERVER)
@@ -210,7 +212,7 @@ class BamSessionTestCase(unittest.TestCase):
         svn_repo_populate(path_svn_checkout)
 
     def tearDown(self):
-        #input('Wait:')
+        # input('Wait:')
         shutil.rmtree(TEMP)
 
     def get_url(self):
@@ -279,4 +281,3 @@ if __name__ == '__main__':
     p.terminate()
 
     shutil.rmtree(TEMP_SERVER, ignore_errors=True)
-