Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge changes from stable branch
authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
Thu, 09 Jun 2011 12:31:28 +0200
changeset 7481 23ae090fc6a4
parent 7479 b0603fc4ed6d (current diff)
parent 7480 97a1768bbbaa (diff)
child 7482 0fa5dee25b7d
merge changes from stable branch
server/sources/storages.py file | annotate | diff | comparison | revisions
sobjects/parsers.py file | annotate | diff | comparison | revisions 
--- 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
cubicweb