Merge pull request #41 from mogproject/develop

Develop

README.rst

@@ -44,7 +44,7 @@ Dependencies
 * Python >= 2.6
 * pytz
 * python-dateutil
-* GitPython
+* GitPython >= 0.3.5
 * boto
 * moto (for testing)
 

src/artifactcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.8"
+__version__ = "0.1.9"

src/artifactcli/util/progressbar.py

@@ -1,6 +1,5 @@
 import sys
 import threading
-from Queue import Queue
 
 
 class ProgressBar(object):
@@ -16,13 +15,12 @@ def __init__(self, interval=1, fp=sys.stdout):
         """
         self.interval = interval
         self.fp = fp
-        self.ex_queue = Queue()  # store all exceptions raised in thread
 
         # create event for handling termination
         self.__stop_event = threading.Event()
 
         # create and start new thread
-        self.thread = threading.Thread(target=lambda: self.__capture_exceptions(self.__target))
+        self.thread = threading.Thread(target=self.__target)
         self.thread.start()
 
     def stop(self):
@@ -34,20 +32,6 @@ def stop(self):
         self.fp.write('\n')
         self.fp.flush()
 
-        # check thread's exceptions
-        if not self.ex_queue.empty():
-            raise self.ex_queue.get_nowait()
-
-    def __capture_exceptions(self, f):
-        """
-        Wrapper function to capture all exceptions which are raised in the thread
-        """
-        try:
-            f()
-        except Exception as e:
-            self.ex_queue.put(e)
-            raise e
-
     def __target(self):
         """
         Inner method for writing dots in the separated thread

tests/artifactcli/util/test_progressbar.py

@@ -42,5 +42,4 @@ def test_progress_bar_io_error(self):
         time.sleep(1)
         fp.close()
         time.sleep(1)
-
         self.assertRaises(ValueError, p.stop)