patches related to cataloging

product/ERP5Type/patches/sqlvar.py

@@ -83,11 +83,16 @@ def SQLVar_render(self, md):
                      % (t, self.__name__, v))
 
 # Patched by yo. datetime is added.
-
 valid_type = 'int', 'float', 'string', 'nb', 'datetime'
 valid_type += tuple(map('datetime(%s)'.__mod__, xrange(7)))
-valid_type = valid_type.__contains__
+try:
+  # BBB
+  from Shared.DC.ZRDB.sqlvar import valid_type
+  valid_type = valid_type.__contains__
+  sqlvar.valid_type = valid_type
+except ImportError:
+  sqlvar.valid_types = valid_type
+    
 
 SQLVar.render = SQLVar_render
 SQLVar.__call__ = SQLVar_render
-sqlvar.valid_type = valid_type

product/ERP5Type/tests/ERP5TypeTestCase.py

@@ -1511,6 +1511,8 @@ def optimize():
   # Python Scripts are exported without those 2 attributes:
   PythonScript.func_code = lazy_func_prop('func_code', None)
   PythonScript.func_defaults = lazy_func_prop('func_defaults', None)
+  PythonScript.__code__ = lazy_func_prop('__code__', None)
+  PythonScript.__defaults__ = lazy_func_prop('__defaults__', None)
 
   def _compile(self):
     if immediate_compilation:

product/ZSQLCatalog/SQLCatalog.py

@@ -1446,7 +1446,7 @@ class Catalog(Folder,
     if meta_type in self.HAS_ARGUMENT_SRC_METATYPE_SET:
       return method.arguments_src.split()
     elif meta_type in self.HAS_FUNC_CODE_METATYPE_SET:
-      return method.func_code.co_varnames[:method.func_code.co_argcount]
+      return method.__code__.co_varnames[:method.__code__.co_argcount]
     # Note: Raising here would completely prevent indexation from working.
     # Instead, let the method actually fail when called, so _catalogObjectList
     # can log the error and carry on.