update code, version 1.6.1

ZedYeung · Nov 28, 2016 · dcdf24e · dcdf24e
1 parent 01e62d8
commit dcdf24e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name="spider",
-    version="1.6.0",
+    version="1.6.1",
     author="xianhu",
     keywords=["spider", "crawler"],
     packages=find_packages(exclude=("test", "test.*", "demos_*")),

diff --git a/spider/abcbase/__init__.py b/spider/abcbase/__init__.py
@@ -4,5 +4,4 @@
 define base classes which used in concurrent module and distributed module
 """
 
-from .abc_base import TPEnum
-from .abc_insts import FetchThread, ParseThread, SaveThread, MonitorThread
+from .abc_base import TPEnum, BaseThread
diff --git a/spider/abcbase/abc_insts.py → spider/concurrent/concur_insts.py b/spider/abcbase/abc_insts.py → spider/concurrent/concur_insts.py
@@ -1,12 +1,12 @@
 # _*_ coding: utf-8 _*_
 
 """
-abc_insts.py by xianhu
+concur_insts.py by xianhu
 """
 
 import time
 import logging
-from .abc_base import TPEnum, BaseThread
+from ..abcbase import TPEnum, BaseThread
 
 
 # ===============================================================================================================================

diff --git a/spider/concurrent/concur_threads.py b/spider/concurrent/concur_threads.py
@@ -8,7 +8,7 @@
 import logging
 import threading
 from ..abcbase import TPEnum
-from ..abcbase import FetchThread, ParseThread, SaveThread, MonitorThread
+from .concur_insts import FetchThread, ParseThread, SaveThread, MonitorThread
 
 
 class ThreadPool(object):