Mailing List Archive

Update of /cvsroot/python/python/dist/src/Tools/freeze
In directory sc8-pr-cvs1:/tmp/cvs-serv9368

Modified Files:
modulefinder.py
Log Message:
refactor universal line endings detection

Index: modulefinder.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/freeze/modulefinder.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** modulefinder.py 26 Nov 2002 08:06:50 -0000 1.26
--- modulefinder.py 26 Nov 2002 09:53:16 -0000 1.27
***************
*** 10,13 ****
--- 10,19 ----
import new

+ if hasattr(sys.__stdout__, "newlines"):
+ READ_MODE = "U" # universal line endings
+ else:
+ # remain compatible with Python < 2.3
+ READ_MODE = "r"
+
IMPORT_NAME = dis.opname.index('IMPORT_NAME')
IMPORT_FROM = dis.opname.index('IMPORT_FROM')
***************
*** 96,103 ****
def run_script(self, pathname):
self.msg(2, "run_script", pathname)
! 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)
--- 102,106 ----
def run_script(self, pathname):
self.msg(2, "run_script", pathname)
! fp = open(pathname, READ_MODE)
stuff = ("", "r", imp.PY_SOURCE)
self.load_module('__main__', fp, pathname, stuff)
***************
*** 106,113 ****
dir, name = os.path.split(pathname)
name, ext = os.path.splitext(name)
! 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)
--- 109,113 ----
dir, name = os.path.split(pathname)
name, ext = os.path.splitext(name)
! fp = open(pathname, READ_MODE)
stuff = (ext, "r", imp.PY_SOURCE)
self.load_module(name, fp, pathname, stuff)