[Python-checkins] python/dist/src/Tools/freeze modulefinder.py,1.21,1.22

nnorwitz@users.sourceforge.net nnorwitz@users.sourceforge.net
Tue, 12 Nov 2002 15:21:18 -0800


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

Modified Files:
	modulefinder.py 
Log Message:
Fix SF # 464405, freeze doesn't like DOS files on Linux

Use universal newline support when opening a file for freezing.


Index: modulefinder.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/freeze/modulefinder.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** modulefinder.py	12 Nov 2002 23:09:12 -0000	1.21
--- modulefinder.py	12 Nov 2002 23:21:15 -0000	1.22
***************
*** 117,121 ****
      def run_script(self, pathname):
          self.msg(2, "run_script", pathname)
!         fp = open(pathname)
          stuff = ("", "r", imp.PY_SOURCE)
          self.load_module('__main__', fp, pathname, stuff)
--- 117,121 ----
      def run_script(self, pathname):
          self.msg(2, "run_script", pathname)
!         fp = open(pathname, "U")
          stuff = ("", "r", imp.PY_SOURCE)
          self.load_module('__main__', fp, pathname, stuff)
***************
*** 124,128 ****
          dir, name = os.path.split(pathname)
          name, ext = os.path.splitext(name)
!         fp = open(pathname)
          stuff = (ext, "r", imp.PY_SOURCE)
          self.load_module(name, fp, pathname, stuff)
--- 124,128 ----
          dir, name = os.path.split(pathname)
          name, ext = os.path.splitext(name)
!         fp = open(pathname, "U")
          stuff = (ext, "r", imp.PY_SOURCE)
          self.load_module(name, fp, pathname, stuff)