From 2105d87c7ef040953278529e0d159fc59f810ca5 Mon Sep 17 00:00:00 2001
From: dkuhlman <none@none>
Date: Mon, 12 May 2014 14:43:14 -0700
Subject: [PATCH] Fix for formatting error and for datetime microseconds
---
README | 8 ++++++++
generateDS.py | 8 ++++++--
setup.py | 6 +++---
tests/OnePer/oneperType00_1One.py | 5 ++++-
tests/OnePer/oneperType00_2One.py | 5 ++++-
tests/OnePer/oneperType01_1One.py | 5 ++++-
tests/OnePer/oneperType01_2One.py | 5 ++++-
tests/OnePer/oneperType02_1One.py | 5 ++++-
tests/OnePer/oneperType02_2One.py | 5 ++++-
tests/OnePer/oneperType03_1One.py | 5 ++++-
tests/OnePer/oneperType03_2One.py | 5 ++++-
tests/abstract_type1_sup.py | 5 ++++-
tests/abstract_type2_sup.py | 5 ++++-
tests/annotations1_sup.py | 5 ++++-
tests/annotations2_sup.py | 5 ++++-
tests/anonymous_type1_sup.py | 5 ++++-
tests/anonymous_type2_sup.py | 5 ++++-
tests/anysimpletype1_sup.py | 5 ++++-
tests/anysimpletype2_sup.py | 5 ++++-
tests/anywildcard1_sup.py | 5 ++++-
tests/anywildcard2_sup.py | 5 ++++-
tests/attr_groups1_sup.py | 5 ++++-
tests/attr_groups2_sup.py | 5 ++++-
tests/catalogtest1_sup.py | 5 ++++-
tests/catalogtest2_sup.py | 5 ++++-
tests/extensions1_sup.py | 5 ++++-
tests/extensions2_sup.py | 5 ++++-
tests/ipo1_sup.py | 5 ++++-
tests/ipo2_sup.py | 5 ++++-
tests/mapcleanname1_sup.py | 5 ++++-
tests/mapcleanname2_sup.py | 5 ++++-
tests/out1_sup.py | 5 ++++-
tests/out2_sup.py | 5 ++++-
tests/people_procincl1_sup.py | 5 ++++-
tests/people_procincl2_sup.py | 5 ++++-
tests/recursive_simpletype1_sup.py | 5 ++++-
tests/recursive_simpletype2_sup.py | 5 ++++-
tests/simplecontent_restriction1_sup.py | 5 ++++-
tests/simplecontent_restriction2_sup.py | 5 ++++-
tests/simpletype_memberspecs1_sup.py | 5 ++++-
tests/simpletype_memberspecs2_sup.py | 5 ++++-
tests/simpletypes_other1_sup.py | 5 ++++-
tests/simpletypes_other2_sup.py | 5 ++++-
tests/to_etree1_sup.py | 5 ++++-
tests/to_etree2_sup.py | 5 ++++-
45 files changed, 185 insertions(+), 47 deletions(-)
diff --git a/README b/README
index bca6627..35bf8a0 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 87a07ca..a820436 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 28ea05e..acdd21f 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 ee9f7b6..4513f82 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 ee9f7b6..4513f82 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 a9dfa99..6123e80 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 a9dfa99..6123e80 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 f2c10fa..adfb17b 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 f2c10fa..adfb17b 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 edd976f..6dca330 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 edd976f..6dca330 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 3a8ddda..88f2de4 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 3a8ddda..88f2de4 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 09d03d3..be3de41 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 09d03d3..be3de41 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 03b5aff..202cc62 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 03b5aff..202cc62 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 22c52c6..49eb155 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 22c52c6..49eb155 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 204bed5..6462296 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 204bed5..6462296 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 5e35b65..d9ce950 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 5e35b65..d9ce950 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 0b32917..4c93875 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 0b32917..4c93875 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 4698f36..022011e 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 4698f36..022011e 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 10b6a91..9426ff3 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 10b6a91..9426ff3 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 71a2c78..06e3559 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 71a2c78..06e3559 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 bdaaa88..13d4804 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 bdaaa88..13d4804 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 f0be0c6..3622f85 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 f0be0c6..3622f85 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 d5f6fe7..76817ae 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 d5f6fe7..76817ae 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 ba9bcf3..70e5ffa 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 ba9bcf3..70e5ffa 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 f84f5c3..54de097 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 f84f5c3..54de097 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 9820d24..e11c004 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 9820d24..e11c004 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 5ea20e9..549d130 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 5ea20e9..549d130 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:
--
GitLab