From 7fde6af81872e65fe7b04c0f34e7ea2754362cf1 Mon Sep 17 00:00:00 2001
From: adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>
Date: Mon, 12 Mar 2001 01:28:29 +0000
Subject: [PATCH] Fix mxDateTime import for version 2.0.0 (now mx.DateTime).

---
 mysql/MySQLdb.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mysql/MySQLdb.py b/mysql/MySQLdb.py
index f41f5d4..46c0a48 100644
--- a/mysql/MySQLdb.py
+++ b/mysql/MySQLdb.py
@@ -61,10 +61,14 @@ type_conv = { FIELD_TYPE.TINY: int,
               FIELD_TYPE.YEAR: int }
 
 try:
-    try: from mx import DateTime # new packaging
-    except ImportError: import DateTime # old packaging
-    from DateTime import Date, Time, Timestamp, ISO, \
-         DateTimeType, DateTimeDeltaType
+    try:
+      from mx import DateTime # new packaging
+      from mx.DateTime import Date, Time, Timestamp, ISO, \
+           DateTimeType, DateTimeDeltaType
+    except ImportError:
+      import DateTime # old packaging
+      from DateTime import Date, Time, Timestamp, ISO, \
+           DateTimeType, DateTimeDeltaType
 
     def DateFromTicks(ticks):
 	return apply(Date, localtime(ticks)[:3])