traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a note that this file should be kept compatible with Python 1.5.2, 

per PEP 291 (although there are currently string methods used).

This patch makes it compatible with 2.2, at least, by detecting
universal newline support.
This commit is contained in:
Thomas Heller 2002-11-25 20:21:59 +00:00
parent 057ab14e7d
commit 919000e9ec
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/freeze/modulefinder.py
View File

@ -1,5 +1,7 @@
"""Find modules used by a script, using introspection."""
# This module should be kept compatible with Python 1.5.2, see PEP 291.
import dis
import imp
import marshal
@ -127,14 +129,20 @@ class ModuleFinder:
def run_script(self, pathname):
self.msg(2, "run_script", pathname)
fp = open(pathname, "U")
if hasattr(sys.stdout, "newlines"): # detect universal newline support
fp = open(pathname, "U")
else:
fp = open(pathname, "r")
stuff = ("", "r", imp.PY_SOURCE)
self.load_module('__main__', fp, pathname, stuff)
def load_file(self, pathname):
dir, name = os.path.split(pathname)
name, ext = os.path.splitext(name)
fp = open(pathname, "U")
if hasattr(sys.stdout, "newlines"):
fp = open(pathname, "U")
else:
fp = open(pathname, "r")
stuff = (ext, "r", imp.PY_SOURCE)
self.load_module(name, fp, pathname, stuff)