[Pypgsql-checkins] CVS: pypgsql/pyPgSQL PgSQL.py,1.2,1.3

[Gerhard H?r. <gha...@us...>]

Update of /cvsroot/pypgsql/pypgsql/pyPgSQL
In directory usw-pr-cvs1:/tmp/cvs-serv15312/pyPgSQL

Modified Files:
	PgSQL.py 
Log Message:

21OCT2001 gh  Change the import of DateTime to avoid conflicts with ZOPE's
              builtin DateTime module.


Index: PgSQL.py
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/pyPgSQL/PgSQL.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgSQL.py	2001/10/17 06:38:21	1.2
--- PgSQL.py	2001/10/20 23:38:04	1.3
***************
*** 30,33 ****
--- 30,35 ----
  # Date      Ini Description						|
  # --------- --- ------------------------------------------------------- |
+ # 21OCT2001 gh  Change the import of DateTime to avoid conflicts with	|
+ # 		ZOPE's builtin DateTime module.				|
  # 17OCT2001 bga Added code to ensure that creation of a binary object	|
  #		via the binary() method always occurs within the con-	|
***************
*** 282,288 ****
  
  try:
-     import DateTime
- except:
      from mx import DateTime
  from libpq import *
  
--- 284,290 ----
  
  try:
      from mx import DateTime
+ except ImportError:
+     import DateTime
  from libpq import *