Merge pull request #1536 from emanuelschuetze/portable-fixes

Fixed FileFinder importer for plugin detection in portable.

openslides/utils/plugins.py

@@ -28,8 +28,7 @@ def get_plugins_from_path(path):
     Collects all modules/packages in the given `path`
     and returns a tuple of their names
     """
-    importer = pkgutil.get_importer(path)
-    return tuple(x[0] for x in importer.iter_modules())
+    return tuple(x[1] for x in pkgutil.iter_modules([path]))
 
 
 def collect_plugins():

requirements_production.txt

@@ -10,7 +10,7 @@ jsonfield>=0.9.19,<1.1
 natsort>=3.2,<3.6
 reportlab>=3.0,<3.2
 roman>=2.0,<2.1
-setuptools>=2.1,<7.1
+setuptools>=2.2,<18.0
 sockjs-tornado>=1.0,<1.1
 tornado>=2.1,<4.1
 whoosh>=2.5.6,<2.6