From ea908419be50c5d3133d7611db572c4208bc22ff Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 12 Jun 2015 23:45:52 +0200
Subject: [PATCH] Fixed FileFinder importer for plugin detection in portable.

Updated setuptools version for openslides-gui.
---
 openslides/utils/plugins.py | 3 +--
 requirements_production.txt | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openslides/utils/plugins.py b/openslides/utils/plugins.py
index fd470dcc8..6f6324fc4 100644
--- a/openslides/utils/plugins.py
+++ b/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():
diff --git a/requirements_production.txt b/requirements_production.txt
index eb0eccc06..fbc54edbc 100644
--- a/requirements_production.txt
+++ b/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