Commit d3011cd1 authored by Martin v. Löwis's avatar Martin v. Löwis

Remove usage of strop module.

parent 66b6e192
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
# note: avoid importing non-builtin modules # note: avoid importing non-builtin modules
import imp ### not available in JPython? import imp ### not available in JPython?
import sys import sys
import strop
import __builtin__ import __builtin__
# for the DirectoryImporter # for the DirectoryImporter
...@@ -78,7 +77,7 @@ class ImportManager: ...@@ -78,7 +77,7 @@ class ImportManager:
def _import_hook(self, fqname, globals=None, locals=None, fromlist=None): def _import_hook(self, fqname, globals=None, locals=None, fromlist=None):
"""Python calls this hook to locate and import a module.""" """Python calls this hook to locate and import a module."""
parts = strop.split(fqname, '.') parts = fqname.split('.')
# determine the context of this import # determine the context of this import
parent = self._determine_import_context(globals) parent = self._determine_import_context(globals)
...@@ -157,7 +156,7 @@ class ImportManager: ...@@ -157,7 +156,7 @@ class ImportManager:
assert globals is parent.__dict__ assert globals is parent.__dict__
return parent return parent
i = strop.rfind(parent_fqname, '.') i = parent_fqname.rfind('.')
# a module outside of a package has no particular import context # a module outside of a package has no particular import context
if i == -1: if i == -1:
...@@ -612,7 +611,6 @@ def _test_revamp(): ...@@ -612,7 +611,6 @@ def _test_revamp():
# TODO # TODO
# #
# from Finn Bock: # from Finn Bock:
# remove use of "strop" -- not available in JPython
# type(sys) is not a module in JPython. what to use instead? # type(sys) is not a module in JPython. what to use instead?
# imp.C_EXTENSION is not in JPython. same for get_suffixes and new_module # imp.C_EXTENSION is not in JPython. same for get_suffixes and new_module
# #
...@@ -638,7 +636,6 @@ def _test_revamp(): ...@@ -638,7 +636,6 @@ def _test_revamp():
# need __path__ processing # need __path__ processing
# performance # performance
# move chaining to a subclass [gjs: it's been nuked] # move chaining to a subclass [gjs: it's been nuked]
# avoid strop
# deinstall should be possible # deinstall should be possible
# query mechanism needed: is a specific Importer installed? # query mechanism needed: is a specific Importer installed?
# py/pyc/pyo piping hooks to filter/process these files # py/pyc/pyo piping hooks to filter/process these files
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment