Fixed unicode paths support with ctypes.

2 files changed, 31 insertions, 12 deletions

diff --git a/examples/unicode.py b/examples/unicode.py
index 579befe..be11e01 100644
--- a/examples/unicode.py
+++ b/examples/unicode.py
@@ -1,9 +1,15 @@
+import os
 from pyinotify import *
 
+# create path
+path = u'/tmp/test\u0444'
+if not os.path.isdir(path):
+    os.mkdir(path)
+
 log.setLevel(10)
 wm = WatchManager()
 notifier = Notifier(wm)
-path = u'/tmp'
+
 wdd = wm.add_watch(path, IN_OPEN)
 wm.update_watch(wdd[path], ALL_EVENTS)
 
diff --git a/pyinotify.py b/pyinotify.py
index 9fb0031..d2767ba 100755
--- a/pyinotify.py
+++ b/pyinotify.py
@@ -1326,9 +1326,8 @@ class WatchManagerError(Exception):
         """
         @param msg: Exception string's description.
         @type msg: string
-        @param wmd: Results of previous operations made by the same function
-                    on previous wd or paths. It also contains the item which
-                    raised this exception.
+        @param wmd: This dictionary contains the wd assigned to paths of the
+                    same call for which watches were successfully added.
         @type wmd: dict
         """
         self.wmd = wmd
@@ -1362,9 +1361,15 @@ class WatchManager:
         Add a watch on path, build a Watch object and insert it in the
         watch manager dictionary. Return the wd value.
         """
-        wd_ = LIBC.inotify_add_watch(self._fd,
-                                     ctypes.create_string_buffer(path),
-                                     mask)
+        ctypes_buffer = None
+        if isinstance(path, str):
+            ctypes_buffer = ctypes.create_string_buffer
+        elif isinstance(path, unicode):
+            ctypes_buffer = ctypes.create_unicode_buffer
+        else:
+            raise WatchManagerError("Invalid path type %s" % type(path), {})
+
+        wd_ = LIBC.inotify_add_watch(self._fd, ctypes_buffer(path), mask)
         if wd_ < 0:
             return wd_
         watch_ = Watch(wd=wd_, path=os.path.normpath(path), mask=mask,
@@ -1524,9 +1529,17 @@ class WatchManager:
 
             if mask:
                 addw = LIBC.inotify_add_watch
-                wd_ = addw(self._fd,
-                           ctypes.create_string_buffer(apath),
-                           mask)
+
+                ctypes_buffer = None
+                if isinstance(apath, str):
+                    ctypes_buffer = ctypes.create_string_buffer
+                elif isinstance(apath, unicode):
+                    ctypes_buffer = ctypes.create_unicode_buffer
+                else:
+                    raise WatchManagerError("Invalid path type %s"% type(apath),
+                                            ret_)
+
+                wd_ = addw(self._fd, ctypes_buffer(apath), mask)
                 if wd_ < 0:
                     ret_[awd] = False
                     err = 'update_watch: cannot update WD=%d (%s)' % (wd_,
@@ -1712,7 +1725,7 @@ class Color:
 
     @staticmethod
     def FieldValue(s):
-        if not isinstance(s, str):
+        if not isinstance(s, str) and not isinstance(s, unicode):
             s = str(s)
         return Color.purple + s + Color.normal
 
@@ -1726,7 +1739,7 @@ class Color:
 
     @staticmethod
     def Simple(s, color):
-        if not isinstance(s, str):
+        if not isinstance(s, str) and not isinstance(s, unicode):
             s = str(s)
         try:
             color_attr = getattr(Color, color)