Port vangheem's commit - Be able to override factory for types

CHANGELOG.rst

@@ -1,3 +1,11 @@
+3.2.17-1
+-------------------
+- Be able to override factory for types
+  [vangheem]
+ - Require pycryptodome instead of pycrypto
+  [vangheem]
+
+
 3.2.16-1
 -------------------
 

VERSION

@@ -1 +1 @@
-3.2.16-1
+3.2.17-1

guillotina/api/content.py

@@ -172,8 +172,8 @@ async def __call__(self):
         # Create object
         try:
             obj = await create_content_in_container(
-                self.context, type_, new_id, id=new_id, creators=(user,),
-                contributors=(user,))
+                self.context, type_, new_id,
+                creators=(user,), contributors=(user,))
         except ValueError as e:
             return ErrorResponse(
                 'CreatingObject',

guillotina/configure/__init__.py

@@ -140,9 +140,11 @@ def load_contenttype(_context, contenttype):
     if 'schema' in conf:
         classImplements(klass, conf['schema'])
 
-    from guillotina.content import ResourceFactory
+    Factory = resolve_dotted_name(
+        conf.get('factory', 'guillotina.content.ResourceFactory')
+    )
 
-    factory = ResourceFactory(
+    factory = Factory(
         klass,
         title='',
         description='',
@@ -616,4 +618,4 @@ def scan(path):
 
 
 def clear():
-    _registered_configurations[:] = []
+    _registered_configurations[:] = []

requirements.txt

@@ -9,7 +9,7 @@ chardet==3.0.4
 jsonschema==2.6.0
 multidict==3.2.0
 pycparser==2.18
-pycrypto==2.6.1
+pycryptodome==3.6.6
 PyJWT==1.6.0
 python-dateutil==2.6.1
 PyYAML==3.12

setup.py

@@ -52,7 +52,7 @@
         'aiohttp>=2.3.6,<2.4.0',
         'jsonschema',
         'python-dateutil',
-        'pycrypto',
+        'pycryptodome',
         'setuptools',
         'ujson',
         'zope.interface',