Skip to content

Commit a0962ac

Browse files
committed
[server] remove legacy support for pkgutil
1 parent 7945d36 commit a0962ac

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

couchdb/server/compiler.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,13 @@
77
import tempfile
88

99
from codecs import BOM_UTF8
10+
from pkgutil import iter_modules
1011
from types import CodeType, FunctionType
1112
from types import ModuleType
1213

1314
from couchdb import json, util
1415
from couchdb.server.exceptions import Error, FatalError, Forbidden
1516

16-
try:
17-
from pkgutil import iter_modules
18-
except ImportError:
19-
try:
20-
# Python 2.4
21-
from pkg_resources import get_importer, zipimport
22-
23-
def iter_modules(paths):
24-
for path in paths:
25-
loader = get_importer(path)
26-
if not isinstance(loader, zipimport.zipimporter):
27-
continue
28-
names = loader.get_data('EGG-INFO/top_level.txt')
29-
for name in names.split('\n')[:-1]:
30-
yield loader, name, None
31-
except ImportError:
32-
get_importer = None
33-
iter_modules = None
34-
zipimport = None
35-
3617
__all__ = ['compile_func', 'require', 'DEFAULT_CONTEXT']
3718

3819
log = logging.getLogger(__name__)

0 commit comments

Comments
 (0)