Merge 32ab7f367b into ba0989b677

core/configwatcher.py

@@ -17,12 +17,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 #
-import pyinotify
+try:
-import threading
+    import pyinotify
-from configobj import ConfigObj
 
-class ConfigWatcher(pyinotify.ProcessEvent, object):
+    import threading
+    from configobj import ConfigObj
 
+    class ConfigWatcher(pyinotify.ProcessEvent, object):
         @property
         def config(self):
             return ConfigObj("./config/mitmf.conf")
@@ -42,3 +43,20 @@ class ConfigWatcher(pyinotify.ProcessEvent, object):
         def on_config_change(self):
             """ We can subclass this function to do stuff after the config file has been modified"""
             pass
+except BaseException:
+    from configobj import ConfigObj
+
+    class ConfigWatcher(object):
+        @property
+        def config(self):
+            return ConfigObj("./config/mitmf.conf")
+
+        def process_IN_MODIFY(self, event):
+            self.on_config_change()
+
+        def start_config_watch(self):
+            pass
+
+        def on_config_change(self):
+            """ We can subclass this function to do stuff after the config file has been modified"""
+            pass

requirements.txt

@@ -1,5 +1,5 @@
-git+git://github.com/kti/python-netfilterqueue
+git+git://github.com/kti/python-netfilterqueue ; sys_platform == "linux"
-pyinotify
+pyinotify; sys_platform == "linux"
 pycrypto
 pyasn1
 cryptography