[pywin32-checkins] pywin32/Pythonwin/pywin __init__.py, 1.4.4.1, 1.4.4.2

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14888/Pythonwin/pywin

Modified Files:
      Tag: py3k
	__init__.py 
Log Message:
Merge various changes from trunk and py3k-integration bzr branch

Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/__init__.py,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -d -r1.4.4.1 -r1.4.4.2
*** __init__.py	29 Aug 2008 06:16:06 -0000	1.4.4.1
--- __init__.py	26 Nov 2008 07:17:38 -0000	1.4.4.2
***************
*** 1,5 ****
  # See if we run in Unicode mode.
  # This may be referenced all over the place, so we save it globally.
! import win32api, win32con, builtins
  
  # This doesn't seem to work correctly on NT - see bug 716708
--- 1,5 ----
  # See if we run in Unicode mode.
  # This may be referenced all over the place, so we save it globally.
! import win32api, win32con
  
  # This doesn't seem to work correctly on NT - see bug 716708
***************
*** 9,11 ****
  default_scintilla_encoding = "utf-8" # Scintilla _only_ supports this ATM
  
! del win32api, win32con, builtins
--- 9,11 ----
  default_scintilla_encoding = "utf-8" # Scintilla _only_ supports this ATM
  
! del win32api, win32con