Feat: Support Python 3

Encode filenames to bytes before passing them to ctypes;
decode from bytes when firing FSEvents.

README.rst

@@ -8,6 +8,12 @@ Supported Platforms
 * Windows (ReadDirectoryChangesW with I/O completion ports)
 * Any other platform (polling)
 
+Supported Python versions
+-------------------------
+
+* Python 2: tested with 2.7
+* Python 3: tested with 3.3+ on Linux
+
 Installation
 ------------
 

fsmonitor/compat.py

@@ -0,0 +1,3 @@
+import sys
+
+PY3 = sys.version_info[0] >= 3

fsmonitor/linux.py

@@ -7,9 +7,10 @@
 # The file is part of FSMonitor, a file-system monitoring library.
 # https://github.com/shaurz/fsmonitor
 
-import os, struct, threading, errno, select
+import sys, os, struct, threading, errno, select
 from ctypes import CDLL, CFUNCTYPE, POINTER, c_int, c_char_p, c_uint32, get_errno
 from .common import FSEvent, FSMonitorOSError
+from .compat import PY3
 
 # set to None when unloaded
 module_loaded = True
@@ -91,7 +92,7 @@ def parse_events(s):
     i = 0
     while i + 16 < len(s):
         wd, mask, cookie, length = struct.unpack_from("iIII", s, i)
-        name = s[i+16:i+16+length].rstrip("\0")
+        name = s[i+16:i+16+length].rstrip(b"\0")
         i += 16 + length
         yield wd, mask, cookie, name
 
@@ -127,6 +128,8 @@ def close(self):
 
     def _add_watch(self, path, flags, user, inotify_flags=0):
         inotify_flags |= convert_flags(flags) | IN_DELETE_SELF
+        if PY3 and not isinstance(path, bytes):
+            path = path.encode(sys.getfilesystemencoding())
         wd = inotify_add_watch(self.__fd, path, inotify_flags)
         if wd == -1:
             errno = get_errno()
@@ -174,6 +177,7 @@ def read_events(self, timeout=None):
         if not module_loaded:
             return events
 
+        fsencoding = sys.getfilesystemencoding()
         for wd, mask, cookie, name in parse_events(s):
             with self.__lock:
                 watch = self.__wd_to_watch.get(wd)
@@ -183,6 +187,8 @@ def read_events(self, timeout=None):
                     if mask & bit:
                         action = action_map.get(bit)
                         if action is not None and (action & watch.flags):
+                            if PY3 and isinstance(name, bytes):
+                                name = name.decode(fsencoding)
                             events.append(FSEvent(watch, action, name))
                     bit <<= 1
                 if mask & IN_IGNORED:

setup.py

@@ -24,4 +24,5 @@
     platforms="Any",
     install_requires=["pypiwin32; sys_platform=='win32'"],
     packages=["fsmonitor"],
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
 )

tox.ini

@@ -1,10 +1,14 @@
 [tox]
 minversion = 1.8
-envlist = py27
+envlist = py27, py33, py34, py35, py36
 
 [testenv]
 basepython =
     py27: {env:TOXPYTHON:python2.7}
+    py33: {env:TOXPYTHON:python3.3}
+    py34: {env:TOXPYTHON:python3.4}
+    py35: {env:TOXPYTHON:python3.5}
+    py36: {env:TOXPYTHON:python3.6}
 deps =
     pytest
 commands =