[pywin32-checkins] pywin32/com/win32com/servers PythonTools.py, 1.3.4.5, 1.3.4.6

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/servers
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3985/com/win32com/servers

Modified Files:
      Tag: py3k
	PythonTools.py 
Log Message:
merge various changes, particularly PyTime, from trunk

Index: PythonTools.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/servers/PythonTools.py,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -C2 -d -r1.3.4.5 -r1.3.4.6
*** PythonTools.py	5 Jan 2009 12:51:26 -0000	1.3.4.5
--- PythonTools.py	8 Jan 2009 03:45:49 -0000	1.3.4.6
***************
*** 6,16 ****
  
    def reload(self, module):
-     # XXX - need py3k work for 'reload'
      if module in sys.modules:
        try:
          from imp import reload
        except ImportError:
!         # builtin in py3k
!         pass
        reload(sys.modules[module])
        return "reload succeeded."
--- 6,14 ----
  
    def reload(self, module):
      if module in sys.modules:
        try:
          from imp import reload
        except ImportError:
!         pass # builtin in py2k
        reload(sys.modules[module])
        return "reload succeeded."