Change pyinotify import for broader compatibility

On some distributions pyinotify is installed in a different way, and the
actual module just contains an internal pyinotify entry, which is the
actual library. On others the main pyinotify module contains the library
itself. We'll try both, in order to be more compatible.

Signed-off-by: Guido Trotter <ultrotter@google.com>

daemons/ganeti-confd

@@ -29,9 +29,13 @@ It uses UDP+HMAC for authentication with a global cluster key.
 import os
 import sys
 import logging
-import pyinotify
 import time
 
+try:
+  from pyinotify import pyinotify
+except ImportError:
+  import pyinotify
+
 from optparse import OptionParser
 
 from ganeti import asyncnotifier

lib/asyncnotifier.py

@@ -22,9 +22,13 @@
 """Asynchronous pyinotify implementation"""
 
 
-import pyinotify
 import asyncore
 
+try:
+    from pyinotify import pyinotify
+except ImportError:
+    import pyinotify
+
 
 class AsyncNotifier(asyncore.file_dispatcher):
   """An asyncore dispatcher for inotify events.