Fix Windows/Linux Errors

rob-white · Oct 22, 2018 · 3d7b832 · 3d7b832
1 parent 56d760d
commit 3d7b832
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 7 deletions.
diff --git a/Pipfile b/Pipfile
@@ -11,3 +11,4 @@ macfsevents = {version = "*", platform_system = "== 'Darwin'"}
 [dev-packages]
 twine = "*"
 pylint = "*"
+pytest = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/folderspy/__init__.py b/folderspy/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.0.4'
+__version__ = '0.0.5'
 
 import platform
 

diff --git a/folderspy/__version__.py b/folderspy/__version__.py
@@ -1 +1 @@
-__version__ = '0.0.4'
+__version__ = '0.0.5'
diff --git a/folderspy/linux/spy.py b/folderspy/linux/spy.py
@@ -7,8 +7,7 @@
 
 class FolderSpy(Spy):
 
-    @staticmethod
-    def _setup_watchers(folders):
+    def _setup_watchers(self, folders):
         """Setup watchers for all folders."""
 
         manager = pyinotify.WatchManager()
@@ -21,9 +20,10 @@ def _setup_watchers(folders):
                 proc_fun=folder,
                 rec=folder.recursive
             )
+
+        return {'manager': manager}
 
-    @staticmethod
-    def _event_loop(folders, **kwargs):
+    def _event_loop(self, folders, **kwargs):
         """Kicks off the event loop that begins watching for events."""
 
         asyncore.loop()
diff --git a/folderspy/windows/spy.py b/folderspy/windows/spy.py
@@ -6,6 +6,11 @@
 
 class FolderSpy(Spy):
 
+    def _setup_watchers(self, folders):
+        """Setup watchers for all folders."""
+
+        return {}
+
     def _event_loop(self, folders, **kwargs):
         """Kicks off the event loop that begins watching for events."""