Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14888/Pythonwin/pywin/framework/editor
Modified Files:
Tag: py3k
vss.py
Log Message:
Merge various changes from trunk and py3k-integration bzr branch
Index: vss.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/vss.py,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -d -r1.4.2.2 -r1.4.2.3
*** vss.py 2 Oct 2008 13:06:36 -0000 1.4.2.2
--- vss.py 26 Nov 2008 07:17:38 -0000 1.4.2.3
***************
*** 83,90 ****
ok = 1
except pythoncom.com_error as exc:
! msg = exc.strerror
! if exc:
! msg = exc[2]
! win32ui.MessageBox(msg, "Error checking out file")
except:
typ, val, tb = sys.exc_info()
--- 83,87 ----
ok = 1
except pythoncom.com_error as exc:
! win32ui.MessageBox(exc.strerror, "Error checking out file")
except:
typ, val, tb = sys.exc_info()
|
