[pywin32-checkins] pywin32/com/win32com __init__.py,1.6,1.7

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

Update of /cvsroot/pywin32/pywin32/com/win32com
In directory sc8-pr-cvs1:/tmp/cvs-serv16542

Modified Files:
	__init__.py 
Log Message:
If win32com\gen_py exists as a directory, then use it (previously, it
must have existed and had __init__)


Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/__init__.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** __init__.py	25 Oct 2003 05:54:50 -0000	1.6
--- __init__.py	25 Oct 2003 06:25:25 -0000	1.7
***************
*** 82,86 ****
  
  # If we don't have a special __gen_path__, see if we have a gen_py as a
! # normal module and use that (ie, "win32com\gen_py" may already exist as
  # a package.
  if not __gen_path__:
--- 82,86 ----
  
  # If we don't have a special __gen_path__, see if we have a gen_py as a
! # normal module and use that (ie, "win32com.gen_py" may already exist as
  # a package.
  if not __gen_path__:
***************
*** 89,98 ****
  		__gen_path__ = sys.modules["win32com.gen_py"].__path__[0]
  	except ImportError:
! 		# We used to dynamically create a directory under win32com -
! 		# but this sucks.  Now we create a version specific directory
! 		# under the user temp directory.
! 		__gen_path__ = os.path.join(
! 							win32api.GetTempPath(), "gen_py",
! 							"%d.%d" % (sys.version_info[0], sys.version_info[1]))
  
  # we must have a __gen_path__, but may not have a gen_py module -
--- 89,105 ----
  		__gen_path__ = sys.modules["win32com.gen_py"].__path__[0]
  	except ImportError:
! 		# If a win32com\gen_py directory already exists, then we use it
! 		# (gencache doesn't insist it have an __init__, but our __import__ 
! 		# above does!
! 		__gen_path__ = os.path.abspath(
! 		                         os.path.join(win32com.__path__[0], "gen_py"))
! 		if not os.path.isdir(__gen_path__):
! 			# We used to dynamically create a directory under win32com -
! 			# but this sucks.  If the dir doesn't already exist, we we 
! 			# create a version specific directory under the user temp 
! 			# directory.
! 			__gen_path__ = os.path.join(
! 								win32api.GetTempPath(), "gen_py",
! 								"%d.%d" % (sys.version_info[0], sys.version_info[1]))
  
  # we must have a __gen_path__, but may not have a gen_py module -