use version file, bump to 0.9.1

diff --git a/deefuzzer/__init__.py b/deefuzzer/__init__.py
index e6437183709537e4e01c152be82f2c77a3e6236f..f1efe794cba17269db1d73d2d1f85c718a2621bb 100644 (file)
--- a/deefuzzer/__init__.py
+++ b/deefuzzer/__init__.py
@@ -1,5 +1,3 @@
 from .core import *
 from .station import *
 from .tools import *
-
-__version__ = '0.9.0'

diff --git a/deefuzzer/core.py b/deefuzzer/core.py
index 061139ce1652bb9da07422723de136c9faf97c1f..60d1a0f67a4f601c273476b56b2a92722f63e57f 100644 (file)
--- a/deefuzzer/core.py
+++ b/deefuzzer/core.py
@@ -34,7 +34,7 @@ from threading import Thread
 from .station import *
 from .tools import *
 
-from .__init__ import __version__
+from .version import __version__
 
 mimetypes.add_type('application/x-yaml', '.yaml')
 mimetypes.add_type('application/x-yaml', '.yml')
@@ -54,10 +54,10 @@ class DeeFuzzer(Thread):
     ignore_errors = False
     max_retry = 0
 
-    def __init__(self, conf_file):
+    def __init__(self, args):
         Thread.__init__(self)
-        self.conf_file = conf_file
-        self.conf = get_conf_dict(self.conf_file)
+        self.config_file = args.config_file
+        self.conf = get_conf_dict(self.config_file)
         # print(self.conf)
         
         if 'deefuzzer' not in self.conf :

diff --git a/setup.py b/setup.py
index 27e4aedbe88b278fdc5e0ab17316ee36eafc581e..c4221d4d22b16cd64416a156b9412e3b235bbbb7 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ setup(
     long_description=open('README.rst').read(),
     author="Guillaume Pellerin",
     author_email="yomguy@parisson.com",
-    version='0.9.0',
+    version='0.9.1',
     install_requires=[
         'setuptools',
         'wheel',