some python2.5 compatability fixes; thanks Andrew Scheller

fs/expose/sftp.py

@@ -24,6 +24,8 @@ is, you probably don't want to use it.
 
 """
 
+from __future__ import with_statement
+
 import os
 import stat as statinfo
 import time

fs/expose/wsgi/wsgi.py

-import json
+
 import urlparse
 import mimetypes
 
@@ -144,4 +144,4 @@ def serve_fs(fs, indexes=True):
     """Serves an FS object via WSGI"""
     application = WSGIServer(fs, indexes)
     return application     
-            
+            
\ No newline at end of file

fs/ftpfs.py

@@ -957,7 +957,7 @@ class FTPFS(FS):
     def _open_ftp(self):
         try:
             ftp = FTP()            
-            if self.default_timeout:
+            if self.default_timeout or sys.version_info < (2,6,):
                 ftp.connect(self.host, self.port)
             else:                
                 ftp.connect(self.host, self.port, self.timeout)

fs/osfs/watch_inotify.py

@@ -24,6 +24,10 @@ except Exception, e:
     if isinstance(e,ImportError):
         raise
     raise ImportError("could not import pyinotify")
+try:
+    pyinotify.WatchManager.get_fd
+except AttributeError:
+    raise ImportError("pyinotify version is too old")
 
 
 class OSFSWatchMixin(WatchableFSMixin):

fs/path.py

@@ -573,8 +573,8 @@ def iswildcard(path):
     
     """
     assert path is not None
-    base_chars = frozenset(basename(path))    
-    return not base_chars.isdisjoint(_wild_chars)    
+    base_chars = frozenset(basename(path))
+    return bool(base_chars.intersection(_wild_chars))
 
 if __name__ == "__main__":
     print recursepath('a/b/c')

fs/wrapfs/lazyfs.py

@@ -36,7 +36,15 @@ class LazyFS(WrapFS):
         try:
             wrapped_fs = self.__dict__["wrapped_fs"]
         except KeyError:
-            return u"<LazyFS: %s>" % (self._fsclass,)
+            #  It appears that python2.5 has trouble printing out
+            #  classes that define a __unicode__ method.
+            try:
+                return u"<LazyFS: %s>" % (self._fsclass,)
+            except TypeError:
+                try:
+                    return u"<LazyFS: %s>" % (self._fsclass.__name__,)
+                except AttributeError:
+                    return u"<LazyFS: <unprintable>>"
         else:
             return u"<LazyFS: %s>" % (wrapped_fs,)