Fix reporting of unsupported inotify on Windows XP.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index 84df4f97e4a8d3accc07c65c9c9ad70505073c48..a2bd853a79dbe766027a5d922c2a7a366c1e20bd 100644 (file)
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -9,6 +9,7 @@ from twisted.application import service
 
 from allmydata.interfaces import IDirectoryNode, NoSuchChildError, ExistingChildError
 
+from allmydata.util import log
 from allmydata.util.fileutil import abspath_expanduser_unicode, precondition_abspath
 from allmydata.util.encodingutil import listdir_unicode, to_filepath, \
      unicode_from_filepath, quote_local_unicode_path, FilenameEncodingError
@@ -26,8 +27,8 @@ def get_inotify_module():
             raise NotImplementedError("filesystem notification needed for drop-upload is not supported.\n"
                                       "This currently requires Linux or Windows.")
         return inotify
-    except ImportError as e:
-        self.log(e)
+    except (ImportError, AttributeError) as e:
+        log.msg(e)
         if sys.platform == "win32":
             raise NotImplementedError("filesystem notification needed for drop-upload is not supported.\n"
                                       "Windows support requires at least Vista, and has only been tested on Windows 7.")