# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1307615488 -7200
# Node ID 23ae090fc6a4a28f5cc9416c865aedca443f6f19
# Parent  b0603fc4ed6dccb5f1dd916883687e31cfc50cb6# Parent  97a1768bbbaac7845149aa38b2f0e7b65bcf69d6
merge changes from stable branch

diff -r b0603fc4ed6d -r 23ae090fc6a4 server/sources/storages.py
--- a/server/sources/storages.py	Thu Jun 09 12:16:10 2011 +0200
+++ b/server/sources/storages.py	Thu Jun 09 12:31:28 2011 +0200
@@ -122,7 +122,7 @@
         fpath = source.binary_to_str(value)
         try:
             return Binary(file(fpath, 'rb').read())
-        except OSError, ex:
+        except EnvironmentError, ex:
             source.critical("can't open %s: %s", value, ex)
             return None
 
diff -r b0603fc4ed6d -r 23ae090fc6a4 sobjects/parsers.py