ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1536 from emanuelschuetze/portable-fixes 

Fixed FileFinder importer for plugin detection in portable.
This commit is contained in:
Norman Jäckel 2015-06-16 17:00:30 +02:00
parent 1ccd2ab91c ea908419be
commit 95683949ec
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/utils/plugins.py
View File

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

2
requirements_production.txt
View File

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