Mac OS X uses EINVAL to signal timeout failure.

Formatting changes.

src/ZEO/ClientStorage.py

@@ -315,8 +315,7 @@ class ClientStorage(object):
         self._lock = threading.Lock()
 
         # XXX need to check for POSIX-ness here
-        if blob_dir is not None and \
-           (os.stat(blob_dir).st_mode & 077) != 0:
+        if blob_dir is not None and (os.stat(blob_dir).st_mode & 077) != 0:
             log2('Blob dir %s has insecure mode setting' % blob_dir,
                  level=logging.WARNING)
 
@@ -978,7 +977,8 @@ class ClientStorage(object):
             3. If not beeing downloaded, start download
         """
         if self.blob_dir is None:
-            raise POSException.Unsupported("No blob cache directory is configured. Can not load blob.")
+            raise POSException.Unsupported("No blob cache directory is "
+                                           "configured.")
 
         blob_filename = self._getCleanFilename(oid, serial)
         # Case 1: Blob is available already, just use it

src/ZEO/tests/forker.py

@@ -185,6 +185,10 @@ def shutdown_zeo_server(adminaddr):
                 break
             raise
         except socket.error, e:
+            # Mac OS X uses EINVAL to signal unbound socket timeout failure
+            if sys.platform == 'darwin': 
+                if e[0] == errno.EINVAL and i > 0:
+                    break
             if e[0] == errno.ECONNREFUSED and i > 0:
                 break
             raise