production changes

product/ERP5/Document/Image.py

@@ -319,7 +319,7 @@ class Image(TextConvertableMixin, File, OFSImage):
 
   def _resize(self, quality, width, height, format, resolution, frame):
     """Resize and resample photo."""
-    parameter_list = ['convert', '-colorspace', 'sRGB', '-depth', '8',
+    parameter_list = ['/usr/bin/timeout', '10', 'convert', '-colorspace', 'sRGB', '-depth', '8',
                                  '-quality', str(quality),
                                  '-geometry', '%sx%s' % (width, height)]
     if format not in VALID_TRANSPARENT_IMAGE_FORMAT_LIST:

product/ERP5/__init__.py

@@ -125,6 +125,6 @@ except ImportError:
   class pyPdfGeneric:
     NameObject = type('NameObject', (str, ), {'__module__': 'pyPdf.Generic'})
 
-  sys.modules['pyPdf.Generic'] = pyPdfGeneric
+  sys.modules['pyPdf.generic'] = pyPdfGeneric
   sys.modules['pyPdf'] = pyPdfGeneric
 

product/ZSQLCatalog/SQLCatalog.py

@@ -1018,6 +1018,7 @@ class Catalog(Folder,
     # It could also have a performance impact for traversals to objects in
     # the acquisition context on Zope 2.12 even when it didn't raise a weird
     # error.
+    if not uid: return None
     method = getattr(self,  self.sql_getitem_by_uid)
     search_result = method(uid = uid)
     if len(search_result) > 0: