mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 11:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

String method conversion.

Browse source
This commit is contained in:
Eric S. Raymond 2001-02-09 10:18:37 +00:00
parent 8d87603e3e
commit bf97c9d87b
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/SimpleHTTPServer.py
View file

@ -11,7 +11,6 @@ __version__ = "0.6"
__all__ = ["SimpleHTTPRequestHandler"] __all__ = ["SimpleHTTPRequestHandler"]
import os import os
import string
import posixpath import posixpath
import BaseHTTPServer import BaseHTTPServer
import urllib import urllib
@ -131,7 +130,7 @@ class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
""" """
path = posixpath.normpath(urllib.unquote(path)) path = posixpath.normpath(urllib.unquote(path))
words = string.splitfields(path, '/') words = path.splitfields('/')
words = filter(None, words) words = filter(None, words)
path = os.getcwd() path = os.getcwd()
for word in words: for word in words:
@ -175,7 +174,7 @@ class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
base, ext = posixpath.splitext(path) base, ext = posixpath.splitext(path)
if self.extensions_map.has_key(ext): if self.extensions_map.has_key(ext):
return self.extensions_map[ext] return self.extensions_map[ext]
ext = string.lower(ext) ext = ext.lower()
if self.extensions_map.has_key(ext): if self.extensions_map.has_key(ext):
return self.extensions_map[ext] return self.extensions_map[ext]
else: else:

9
Lib/ihooks.py
View file

@ -55,7 +55,6 @@ import __builtin__
import imp import imp
import os import os
import sys import sys
import string
__all__ = ["BasicModuleLoader","Hooks","ModuleLoader","FancyModuleLoader", __all__ = ["BasicModuleLoader","Hooks","ModuleLoader","FancyModuleLoader",
"BasicModuleImporter","ModuleImporter","install","uninstall"] "BasicModuleImporter","ModuleImporter","install","uninstall"]
@ -412,7 +411,7 @@ class ModuleImporter(BasicModuleImporter):
assert globals is parent.__dict__ assert globals is parent.__dict__
return parent return parent
if '.' in pname: if '.' in pname:
i = string.rfind(pname, '.') i = pname.rfind('.')
pname = pname[:i] pname = pname[:i]
parent = self.modules[pname] parent = self.modules[pname]
assert parent.__name__ == pname assert parent.__name__ == pname
@ -421,7 +420,7 @@ class ModuleImporter(BasicModuleImporter):
def find_head_package(self, parent, name): def find_head_package(self, parent, name):
if '.' in name: if '.' in name:
i = string.find(name, '.') i = name.find('.')
head = name[:i] head = name[:i]
tail = name[i+1:] tail = name[i+1:]
else: else:
@ -443,7 +442,7 @@ class ModuleImporter(BasicModuleImporter):
def load_tail(self, q, tail): def load_tail(self, q, tail):
m = q m = q
while tail: while tail:
i = string.find(tail, '.') i = tail.find('.')
if i < 0: i = len(tail) if i < 0: i = len(tail)
head, tail = tail[:i], tail[i+1:] head, tail = tail[:i], tail[i+1:]
mname = "%s.%s" % (m.__name__, head) mname = "%s.%s" % (m.__name__, head)
@ -493,7 +492,7 @@ class ModuleImporter(BasicModuleImporter):
name = module.__name__ name = module.__name__
if '.' not in name: if '.' not in name:
return self.import_it(name, name, None, force_load=1) return self.import_it(name, name, None, force_load=1)
i = string.rfind(name, '.') i = name.rfind('.')
pname = name[:i] pname = name[:i]
parent = self.modules[pname] parent = self.modules[pname]
return self.import_it(name[i+1:], name, parent, force_load=1) return self.import_it(name[i+1:], name, parent, force_load=1)