diff --git a/README b/README
index bca66273267948a78c0ec12dace2723ac84222c3..35bf8a0e19208971c83d9b34a17191abfd80ebf3 100644
--- a/README
+++ b/README
@@ -141,6 +141,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
+Version 2.12e (05/12/2014)
+- Fix for formatting error. Thanks to Nikolay Lavrov for catching
+ this and for providing a fix.
+- Fix to gds_parse_datetime(). The Python datetime module's
+ datetime object uses microseconds, but xs:dateTime uses fractions
+ of a second (e.g. 0.123). Converted from decimal fraction to
+ microseconds. Thanks to Mikki Weesenaar for catching this.
+
Version 2.12d (04/02/2014)
- Fix for an infinite loop caused by inconsistent use of
mapped/clean names with list AlreadyGenerated. Thanks to Jerome
diff --git a/generateDS.py b/generateDS.py
index 87a07ca651c30ed9baa2fff59b9939b3a75df4e1..a82043664134e516161948b5b9930126cec991cc 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -3247,7 +3247,8 @@ def generateBuildMixed_1(wrt, prefix, child, headChild, keyword, delayed):
wrt(" class_obj_ = self.get_class_obj_("
"child_, %s%s)\n" % (
prefix, cleanupName(mapName(childType)), ))
- wrt(" class_obj_ = %s%s.factory()\n")
+ wrt(" class_obj_ = %s%s.factory()\n" % (
+ prefix, cleanupName(mapName(childType)), ))
else:
wrt(" obj_ = %s%s.factory()\n" % (
prefix, cleanupName(mapName(childType))))
@@ -4496,7 +4497,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%%s.%%s' %% (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%%Y-%%m-%%dT%%H:%%M:%%S.%%f')
else:
diff --git a/setup.py b/setup.py
index 28ea05e38e1f7edd911650509f206084d97019e4..acdd21f805a81ebee2f9dafffaab5e25a805680d 100644
--- a/setup.py
+++ b/setup.py
@@ -10,10 +10,10 @@ setup(name="generateDS",
version="2.12d",
##VERSION##
author="Dave Kuhlman",
- author_email="dkuhlman@rexx.com",
+ author_email="dkuhlman@davekuhlman.org",
maintainer="Dave Kuhlman",
- maintainer_email="dkuhlman@rexx.com",
- url="http://www.rexx.com/~dkuhlman/generateDS.html",
+ maintainer_email="dkuhlman@davekuhlman.org",
+ url="http://www.davekuhlman.org/generateDS.html",
description="Generate Python data structures and XML parser from Xschema",
long_description="""\
generateDS.py generates Python data structures (for example, class
diff --git a/tests/OnePer/oneperType00_1One.py b/tests/OnePer/oneperType00_1One.py
index ee9f7b6900ebb93acbd6deac8a38d1e9a42a069c..4513f82b21e3ec5a46c4e1b33a105e62f52fd4c0 100644
--- a/tests/OnePer/oneperType00_1One.py
+++ b/tests/OnePer/oneperType00_1One.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/OnePer/oneperType00_2One.py b/tests/OnePer/oneperType00_2One.py
index ee9f7b6900ebb93acbd6deac8a38d1e9a42a069c..4513f82b21e3ec5a46c4e1b33a105e62f52fd4c0 100644
--- a/tests/OnePer/oneperType00_2One.py
+++ b/tests/OnePer/oneperType00_2One.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/OnePer/oneperType01_1One.py b/tests/OnePer/oneperType01_1One.py
index a9dfa99c381db74df0b01e70a7c8dbf79659163f..6123e80fef1bb902574cb05f5c5d227a44d44d24 100644
--- a/tests/OnePer/oneperType01_1One.py
+++ b/tests/OnePer/oneperType01_1One.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/OnePer/oneperType01_2One.py b/tests/OnePer/oneperType01_2One.py
index a9dfa99c381db74df0b01e70a7c8dbf79659163f..6123e80fef1bb902574cb05f5c5d227a44d44d24 100644
--- a/tests/OnePer/oneperType01_2One.py
+++ b/tests/OnePer/oneperType01_2One.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/OnePer/oneperType02_1One.py b/tests/OnePer/oneperType02_1One.py
index f2c10fac23758bfa4c5de5cee0033c9b51909dcd..adfb17b0f0a017cc27edc696d4821427288c42ad 100644
--- a/tests/OnePer/oneperType02_1One.py
+++ b/tests/OnePer/oneperType02_1One.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/OnePer/oneperType02_2One.py b/tests/OnePer/oneperType02_2One.py
index f2c10fac23758bfa4c5de5cee0033c9b51909dcd..adfb17b0f0a017cc27edc696d4821427288c42ad 100644
--- a/tests/OnePer/oneperType02_2One.py
+++ b/tests/OnePer/oneperType02_2One.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/OnePer/oneperType03_1One.py b/tests/OnePer/oneperType03_1One.py
index edd976fe4299a6886d2be834d3168f1acbc0ffb0..6dca33026c104fd476d4cf05b17b0d2c48ace3d3 100644
--- a/tests/OnePer/oneperType03_1One.py
+++ b/tests/OnePer/oneperType03_1One.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/OnePer/oneperType03_2One.py b/tests/OnePer/oneperType03_2One.py
index edd976fe4299a6886d2be834d3168f1acbc0ffb0..6dca33026c104fd476d4cf05b17b0d2c48ace3d3 100644
--- a/tests/OnePer/oneperType03_2One.py
+++ b/tests/OnePer/oneperType03_2One.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/abstract_type1_sup.py b/tests/abstract_type1_sup.py
index 3a8ddda2158d1c46306d41647176446bf2146be8..88f2de4d072c5fb9d87c12b5510017efdd9edf5e 100644
--- a/tests/abstract_type1_sup.py
+++ b/tests/abstract_type1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/abstract_type2_sup.py b/tests/abstract_type2_sup.py
index 3a8ddda2158d1c46306d41647176446bf2146be8..88f2de4d072c5fb9d87c12b5510017efdd9edf5e 100644
--- a/tests/abstract_type2_sup.py
+++ b/tests/abstract_type2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/annotations1_sup.py b/tests/annotations1_sup.py
index 09d03d3a816c78e39dd98a26b21fcbf9564ab062..be3de4132c9bd174720ccb28975ece1ec08862ca 100644
--- a/tests/annotations1_sup.py
+++ b/tests/annotations1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/annotations2_sup.py b/tests/annotations2_sup.py
index 09d03d3a816c78e39dd98a26b21fcbf9564ab062..be3de4132c9bd174720ccb28975ece1ec08862ca 100644
--- a/tests/annotations2_sup.py
+++ b/tests/annotations2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py
index 03b5aff6e0de8c50abe263d4aa4386d68a63f3b9..202cc62871047522189d6c87ad9eb9ab9e4a8421 100644
--- a/tests/anonymous_type1_sup.py
+++ b/tests/anonymous_type1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/anonymous_type2_sup.py b/tests/anonymous_type2_sup.py
index 03b5aff6e0de8c50abe263d4aa4386d68a63f3b9..202cc62871047522189d6c87ad9eb9ab9e4a8421 100644
--- a/tests/anonymous_type2_sup.py
+++ b/tests/anonymous_type2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/anysimpletype1_sup.py b/tests/anysimpletype1_sup.py
index 22c52c649c59e3d4227e485ef4eff51b4016f981..49eb1551677165fab4396407ab89a587a8e330ae 100644
--- a/tests/anysimpletype1_sup.py
+++ b/tests/anysimpletype1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/anysimpletype2_sup.py b/tests/anysimpletype2_sup.py
index 22c52c649c59e3d4227e485ef4eff51b4016f981..49eb1551677165fab4396407ab89a587a8e330ae 100644
--- a/tests/anysimpletype2_sup.py
+++ b/tests/anysimpletype2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/anywildcard1_sup.py b/tests/anywildcard1_sup.py
index 204bed5e734337e087e591425562393378b437bf..6462296eb43bef0445f1da38e2403060835a8763 100644
--- a/tests/anywildcard1_sup.py
+++ b/tests/anywildcard1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/anywildcard2_sup.py b/tests/anywildcard2_sup.py
index 204bed5e734337e087e591425562393378b437bf..6462296eb43bef0445f1da38e2403060835a8763 100644
--- a/tests/anywildcard2_sup.py
+++ b/tests/anywildcard2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/attr_groups1_sup.py b/tests/attr_groups1_sup.py
index 5e35b65f0570676691ee6d78b32907fe53dba932..d9ce95034dcfea1ee1f3830e24fd2228fd81338b 100644
--- a/tests/attr_groups1_sup.py
+++ b/tests/attr_groups1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/attr_groups2_sup.py b/tests/attr_groups2_sup.py
index 5e35b65f0570676691ee6d78b32907fe53dba932..d9ce95034dcfea1ee1f3830e24fd2228fd81338b 100644
--- a/tests/attr_groups2_sup.py
+++ b/tests/attr_groups2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/catalogtest1_sup.py b/tests/catalogtest1_sup.py
index 0b329177b64178cb08f298d0756142cb5880a0b7..4c93875cb07bbd8a328f93ace3bb8e9ff155d74c 100644
--- a/tests/catalogtest1_sup.py
+++ b/tests/catalogtest1_sup.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/catalogtest2_sup.py b/tests/catalogtest2_sup.py
index 0b329177b64178cb08f298d0756142cb5880a0b7..4c93875cb07bbd8a328f93ace3bb8e9ff155d74c 100644
--- a/tests/catalogtest2_sup.py
+++ b/tests/catalogtest2_sup.py
@@ -231,7 +231,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py
index 4698f366b93e4fa211d13b37e1e6d135dcaec33d..022011e7e0e35ac002d14e9b5f38fe3a92c1d9af 100644
--- a/tests/extensions1_sup.py
+++ b/tests/extensions1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/extensions2_sup.py b/tests/extensions2_sup.py
index 4698f366b93e4fa211d13b37e1e6d135dcaec33d..022011e7e0e35ac002d14e9b5f38fe3a92c1d9af 100644
--- a/tests/extensions2_sup.py
+++ b/tests/extensions2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/ipo1_sup.py b/tests/ipo1_sup.py
index 10b6a91af00679a7ae0a21f3f74fde163feda140..9426ff3c6bd6e8387dd7761eaf828d289d8bc3c8 100644
--- a/tests/ipo1_sup.py
+++ b/tests/ipo1_sup.py
@@ -229,7 +229,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/ipo2_sup.py b/tests/ipo2_sup.py
index 10b6a91af00679a7ae0a21f3f74fde163feda140..9426ff3c6bd6e8387dd7761eaf828d289d8bc3c8 100644
--- a/tests/ipo2_sup.py
+++ b/tests/ipo2_sup.py
@@ -229,7 +229,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/mapcleanname1_sup.py b/tests/mapcleanname1_sup.py
index 71a2c784ab44bf7300c71152ee99562941f8f8d8..06e3559c7e9e5ff94218bab3636e44c57e9874e2 100644
--- a/tests/mapcleanname1_sup.py
+++ b/tests/mapcleanname1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/mapcleanname2_sup.py b/tests/mapcleanname2_sup.py
index 71a2c784ab44bf7300c71152ee99562941f8f8d8..06e3559c7e9e5ff94218bab3636e44c57e9874e2 100644
--- a/tests/mapcleanname2_sup.py
+++ b/tests/mapcleanname2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/out1_sup.py b/tests/out1_sup.py
index bdaaa885af3fae9c2c28e10bad12e4aef189462e..13d4804d147220b2b9e26e063d2f83fc1ab77471 100644
--- a/tests/out1_sup.py
+++ b/tests/out1_sup.py
@@ -229,7 +229,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/out2_sup.py b/tests/out2_sup.py
index bdaaa885af3fae9c2c28e10bad12e4aef189462e..13d4804d147220b2b9e26e063d2f83fc1ab77471 100644
--- a/tests/out2_sup.py
+++ b/tests/out2_sup.py
@@ -229,7 +229,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py
index f0be0c6222502dd626d3a5bfc19efed9777e8e51..3622f85beb2adfe0927603f58ab3373fa05165ec 100644
--- a/tests/people_procincl1_sup.py
+++ b/tests/people_procincl1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/people_procincl2_sup.py b/tests/people_procincl2_sup.py
index f0be0c6222502dd626d3a5bfc19efed9777e8e51..3622f85beb2adfe0927603f58ab3373fa05165ec 100644
--- a/tests/people_procincl2_sup.py
+++ b/tests/people_procincl2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/recursive_simpletype1_sup.py b/tests/recursive_simpletype1_sup.py
index d5f6fe768c10746056800c456e430bb78d8a7396..76817ae41bfbd9d0f763c8680898d22005db50ac 100644
--- a/tests/recursive_simpletype1_sup.py
+++ b/tests/recursive_simpletype1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/recursive_simpletype2_sup.py b/tests/recursive_simpletype2_sup.py
index d5f6fe768c10746056800c456e430bb78d8a7396..76817ae41bfbd9d0f763c8680898d22005db50ac 100644
--- a/tests/recursive_simpletype2_sup.py
+++ b/tests/recursive_simpletype2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/simplecontent_restriction1_sup.py b/tests/simplecontent_restriction1_sup.py
index ba9bcf366b4e6b5108b17c443abfc623528d5886..70e5ffae981ab43904d6901b56d398552ddfa132 100644
--- a/tests/simplecontent_restriction1_sup.py
+++ b/tests/simplecontent_restriction1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/simplecontent_restriction2_sup.py b/tests/simplecontent_restriction2_sup.py
index ba9bcf366b4e6b5108b17c443abfc623528d5886..70e5ffae981ab43904d6901b56d398552ddfa132 100644
--- a/tests/simplecontent_restriction2_sup.py
+++ b/tests/simplecontent_restriction2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/simpletype_memberspecs1_sup.py b/tests/simpletype_memberspecs1_sup.py
index f84f5c3f32d7728364be237b004fe6cfb9c7baae..54de0975d1c3e2cbfc0f0ad9545ab046be475b05 100644
--- a/tests/simpletype_memberspecs1_sup.py
+++ b/tests/simpletype_memberspecs1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/simpletype_memberspecs2_sup.py b/tests/simpletype_memberspecs2_sup.py
index f84f5c3f32d7728364be237b004fe6cfb9c7baae..54de0975d1c3e2cbfc0f0ad9545ab046be475b05 100644
--- a/tests/simpletype_memberspecs2_sup.py
+++ b/tests/simpletype_memberspecs2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/simpletypes_other1_sup.py b/tests/simpletypes_other1_sup.py
index 9820d241752db006d791d49d6bf58ed81592f6cc..e11c0045f21a0b59c3631f5b249497acab3f8cc4 100644
--- a/tests/simpletypes_other1_sup.py
+++ b/tests/simpletypes_other1_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/simpletypes_other2_sup.py b/tests/simpletypes_other2_sup.py
index 9820d241752db006d791d49d6bf58ed81592f6cc..e11c0045f21a0b59c3631f5b249497acab3f8cc4 100644
--- a/tests/simpletypes_other2_sup.py
+++ b/tests/simpletypes_other2_sup.py
@@ -230,7 +230,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/to_etree1_sup.py b/tests/to_etree1_sup.py
index 5ea20e90f511325944928639fdf34ae5190cdb71..549d130080cb4cdf03c9078e02924265231e1f92 100644
--- a/tests/to_etree1_sup.py
+++ b/tests/to_etree1_sup.py
@@ -232,7 +232,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else:
diff --git a/tests/to_etree2_sup.py b/tests/to_etree2_sup.py
index 5ea20e90f511325944928639fdf34ae5190cdb71..549d130080cb4cdf03c9078e02924265231e1f92 100644
--- a/tests/to_etree2_sup.py
+++ b/tests/to_etree2_sup.py
@@ -232,7 +232,10 @@ except ImportError, exp:
tz = GeneratedsSuper._FixedOffsetTZ(
tzoff, results.group(0))
input_data = input_data[:-6]
- if len(input_data.split('.')) > 1:
+ time_parts = input_data.split('.')
+ if len(time_parts) > 1:
+ micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
+ input_data = '%s.%s' % (time_parts[0], micro_seconds, )
dt = datetime_.datetime.strptime(
input_data, '%Y-%m-%dT%H:%M:%S.%f')
else: