[Python-checkins] CVS: python/dist/src/Lib/distutils msvccompiler.py,1.43.6.1,1.43.6.2

Michael Hudson mwh@users.sourceforge.net
Fri, 22 Feb 2002 05:55:31 -0800


Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv24321

Modified Files:
      Tag: release22-maint
	msvccompiler.py 
Log Message:
Backport theller's check-in of revision 1.45:

Make it 1.5.2 compatible again.

(I'm not sure how having symlinks around the repository interacts with 
branches -- I'm going to tread carefully in here)



Index: msvccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/msvccompiler.py,v
retrieving revision 1.43.6.1
retrieving revision 1.43.6.2
diff -C2 -d -r1.43.6.1 -r1.43.6.2
*** msvccompiler.py	6 Feb 2002 17:09:18 -0000	1.43.6.1
--- msvccompiler.py	22 Feb 2002 13:55:28 -0000	1.43.6.2
***************
*** 118,125 ****
                          V = string.split(v,';')
                          for v in V:
!                             try:
!                                 v = v.encode("mbcs")
!                             except UnicodeError:
!                                 pass
                              if v == '' or v in L: continue
                              L.append(v)
--- 118,126 ----
                          V = string.split(v,';')
                          for v in V:
!                             if hasattr(v, "encode"):
!                                 try:
!                                     v = v.encode("mbcs")
!                                 except UnicodeError:
!                                     pass
                              if v == '' or v in L: continue
                              L.append(v)