diff --git a/generateDS.py b/generateDS.py
index f836d1ca74e36f6bfba8617d82382375800bb00a..3e9335e0206a6cd94c98acdc848cc01c5f39d384 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -5334,10 +5334,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/OnePer/oneperType00_2One.py b/tests/OnePer/oneperType00_2One.py
index 55efc429269260f458d0db4e700fa266fcab4498..99f1c66d91338fa210660a5a883d1334c303bcf4 100644
--- a/tests/OnePer/oneperType00_2One.py
+++ b/tests/OnePer/oneperType00_2One.py
@@ -372,10 +372,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/OnePer/oneperType01_2One.py b/tests/OnePer/oneperType01_2One.py
index efbcc68d3c7d168c4503e03c96c6b09c93d5c3c8..652b9e635d13a8ed190b3446a469a7e8d2f08074 100644
--- a/tests/OnePer/oneperType01_2One.py
+++ b/tests/OnePer/oneperType01_2One.py
@@ -372,10 +372,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/OnePer/oneperType02_2One.py b/tests/OnePer/oneperType02_2One.py
index 04ac805c27db1b624ec2d72a25e0b7d9ed2a8e9f..06578e2eb366080841fe96054d801d532eee79e8 100644
--- a/tests/OnePer/oneperType02_2One.py
+++ b/tests/OnePer/oneperType02_2One.py
@@ -372,10 +372,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/OnePer/oneperType03_2One.py b/tests/OnePer/oneperType03_2One.py
index 2af439092f95e07bf0b78b5526e2de7d25381913..6bea073ef654d3a7e766156d4b222c02ca2f4608 100644
--- a/tests/OnePer/oneperType03_2One.py
+++ b/tests/OnePer/oneperType03_2One.py
@@ -372,10 +372,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/abstract_type1_sup.py b/tests/abstract_type1_sup.py
index 47ddb5561ff62856d3ab8eb6009a0f43e4540165..08422d5be4373b97720393e753eedde37b7f7a44 100644
--- a/tests/abstract_type1_sup.py
+++ b/tests/abstract_type1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/annotations1_sup.py b/tests/annotations1_sup.py
index d9ef298dbde1ae40ea4710df1f01f380f7122096..87aa8d70b223ad5ff70b3fa26b513b65d45e66b1 100644
--- a/tests/annotations1_sup.py
+++ b/tests/annotations1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py
index 15998f8dd86ccf3a6c2b05391714efb82d12defc..e373bf8daab4da4cb32f052ec3e952f640d6dd49 100644
--- a/tests/anonymous_type1_sup.py
+++ b/tests/anonymous_type1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/anysimpletype1_sup.py b/tests/anysimpletype1_sup.py
index 8fc85d5a511d0df710228af622c0d909d0582079..28a1450c1f979bd311552f72174fd520349812a9 100644
--- a/tests/anysimpletype1_sup.py
+++ b/tests/anysimpletype1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/anywildcard1_sup.py b/tests/anywildcard1_sup.py
index 76cc49ab147c7230afcaa589facbdca593089452..2d7a08cf10e7261a4848b3fc6c0d6981fc689e87 100644
--- a/tests/anywildcard1_sup.py
+++ b/tests/anywildcard1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/attr_groups1_sup.py b/tests/attr_groups1_sup.py
index 085a6e1d89abd358915cdf0ea07683b010c41bab..c9f62ff4f295ad00ecf29aa8795e6951a9a1c8f4 100644
--- a/tests/attr_groups1_sup.py
+++ b/tests/attr_groups1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/catalogtest1_sup.py b/tests/catalogtest1_sup.py
index a8dcc9af29ca7327b7cac56674982c81aa47b46e..6fa48d3c4398afc861ecdceffc8b796ed3e69bcb 100644
--- a/tests/catalogtest1_sup.py
+++ b/tests/catalogtest1_sup.py
@@ -372,10 +372,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/cdata1_sup.py b/tests/cdata1_sup.py
index 3c95e191094cf8eae4bbe3ab7c4eaca548a257c6..af309dd2e35b4f36d105538709760913b123ed6a 100644
--- a/tests/cdata1_sup.py
+++ b/tests/cdata1_sup.py
@@ -372,10 +372,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/cleanupname1_sup.py b/tests/cleanupname1_sup.py
index 0217e3568d824a3958d18e052832e957a88c2374..59f05e9dd604760d92d7d16331f583a76c39b5a8 100644
--- a/tests/cleanupname1_sup.py
+++ b/tests/cleanupname1_sup.py
@@ -372,10 +372,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/defaults_cases1_sup.py b/tests/defaults_cases1_sup.py
index 29d55ed60d12f4060ac7bd035563e214bcbe5919..7eb901a6a4043631f36b1f956f351e8033507699 100644
--- a/tests/defaults_cases1_sup.py
+++ b/tests/defaults_cases1_sup.py
@@ -370,10 +370,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/defaults_coverage1_sup.py b/tests/defaults_coverage1_sup.py
index 291585ff94788fa53d99761ee102870f93e79c0e..702722d4eb944107837cd372a23c5b4b07f7cf01 100644
--- a/tests/defaults_coverage1_sup.py
+++ b/tests/defaults_coverage1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py
index 16f648c6c47bd7c4391d9dd0e38e1bdef06e9d39..5f3cb9a235b796f9f913d8e1ddd42c931fef22b4 100644
--- a/tests/extensions1_sup.py
+++ b/tests/extensions1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/ipo1_sup.py b/tests/ipo1_sup.py
index 5ff55611f6244ed4da01cc7074ca724ea202d046..5a27592754e45bc90b47137af1daf1a986974597 100644
--- a/tests/ipo1_sup.py
+++ b/tests/ipo1_sup.py
@@ -370,10 +370,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/ipo2_sup.py b/tests/ipo2_sup.py
index 5ff55611f6244ed4da01cc7074ca724ea202d046..5a27592754e45bc90b47137af1daf1a986974597 100644
--- a/tests/ipo2_sup.py
+++ b/tests/ipo2_sup.py
@@ -370,10 +370,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/mapcleanname1_sup.py b/tests/mapcleanname1_sup.py
index 8a714741cfea0f6a1b7b211daa41eb781cb9f4ff..02e113620bfb1f7086686a1c1bcfb14b9a5b80fa 100644
--- a/tests/mapcleanname1_sup.py
+++ b/tests/mapcleanname1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/nested_def1_sup.py b/tests/nested_def1_sup.py
index 3a3dda95a1894cc1298dd5c50015fd3f5ebaab4c..a0ca03d3cc37ea8c1c14a8f99d5baefe0240f748 100644
--- a/tests/nested_def1_sup.py
+++ b/tests/nested_def1_sup.py
@@ -370,10 +370,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/out1_sup.py b/tests/out1_sup.py
index f0074d3211e984f38eaec1f7b3b54d2eaaea0b0b..7d3900a737b2bc602834764aeed8b15f69d675ae 100644
--- a/tests/out1_sup.py
+++ b/tests/out1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py
index 58f687e9fcfdb898fb5225865a5ba0ffb0b1900d..dac3ff1ee9071ec36b27a023f71086dbc60f41b6 100644
--- a/tests/people_procincl1_sup.py
+++ b/tests/people_procincl1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/prefix_classname1_sup.py b/tests/prefix_classname1_sup.py
index 1f9b3c00a534f1c274ac5d256633b43acfd05cb5..eddff8707c242b1a2f0c8a646a431cabd81efb0c 100644
--- a/tests/prefix_classname1_sup.py
+++ b/tests/prefix_classname1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/recursive_simpletype1_sup.py b/tests/recursive_simpletype1_sup.py
index 9f04ae7f15e01b0bdc900fb7c6057a69333dcc1b..571ffda4d5f45c04a1c0979408b58184df62d557 100644
--- a/tests/recursive_simpletype1_sup.py
+++ b/tests/recursive_simpletype1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/reference_simpletype1_sup.py b/tests/reference_simpletype1_sup.py
index 136024a9bf936a6bcdde43fb581c90346bde3691..849823adfcf3aeb327bfb20a723de97cd95a9b86 100644
--- a/tests/reference_simpletype1_sup.py
+++ b/tests/reference_simpletype1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/rem_dup_elems1_sup.py b/tests/rem_dup_elems1_sup.py
index e654b499e3a094b6019f7ed1c7769a1f0b8928dd..ee67fd213fd15f5b7eafdc09a58793b79da95739 100644
--- a/tests/rem_dup_elems1_sup.py
+++ b/tests/rem_dup_elems1_sup.py
@@ -372,10 +372,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/simplecontent_restriction1_sup.py b/tests/simplecontent_restriction1_sup.py
index b3e7b314e197ed9d8ed8de71bf0a9fa65ff15deb..155013ff94b88b1c00a433885c7cf830bb413e91 100644
--- a/tests/simplecontent_restriction1_sup.py
+++ b/tests/simplecontent_restriction1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/simpletype_memberspecs1_sup.py b/tests/simpletype_memberspecs1_sup.py
index 3d978815565c9db99e609f10b6e3864edfb86c2b..75316542f57097044f726cedc393b76c55350029 100644
--- a/tests/simpletype_memberspecs1_sup.py
+++ b/tests/simpletype_memberspecs1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/simpletypes_other1_sup.py b/tests/simpletypes_other1_sup.py
index 6f146c36cefcfe20f81b35af938acabed18e882c..7efca4b554e8d8466c4b56fbf9b8056e34fe6e90 100644
--- a/tests/simpletypes_other1_sup.py
+++ b/tests/simpletypes_other1_sup.py
@@ -371,10 +371,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/test.py b/tests/test.py
index 84135e01ca98365b8be4f77acea4d3d1a7732a0b..d76e2668b2f91ac259bce87fec57cb068a3e6a92 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -62,7 +62,7 @@ class GenTest(unittest.TestCase):
self.compareFiles('out1_sup.py', 'out2_sup.py', ignore=())
self.compareFiles('out1_sub.py', 'out2_sub.py')
# cleanup generated files
- self.remove('out2_sup.py')
+ #self.remove('out2_sup.py')
self.remove('out2_sub.py')
def test_003_element_groups(self):
@@ -276,7 +276,7 @@ class GenTest(unittest.TestCase):
self.failUnlessEqual(content1, content2)
# cleanup generated files
self.remove('literal2.py')
- self.remove('out2_sup.py')
+ #self.remove('out2_sup.py')
self.remove('out2_sub.py')
def test_010_simplecontent_restriction(self):
diff --git a/tests/to_etree1_sup.py b/tests/to_etree1_sup.py
index 231d243ddc60c2da05d03acd1f3e3bd642cbc67b..a91bf2159a7092e606515f019db4eeb21525af56 100644
--- a/tests/to_etree1_sup.py
+++ b/tests/to_etree1_sup.py
@@ -373,10 +373,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/validate_simpletypes1_sup.py b/tests/validate_simpletypes1_sup.py
index f3ec19f7ed4effc4be8d38061f0d44fb199da836..7e215572433878292263f8af306afdb34f9297e1 100644
--- a/tests/validate_simpletypes1_sup.py
+++ b/tests/validate_simpletypes1_sup.py
@@ -370,10 +370,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result
diff --git a/tests/validate_simpletypes2_sup.py b/tests/validate_simpletypes2_sup.py
index f3ec19f7ed4effc4be8d38061f0d44fb199da836..7e215572433878292263f8af306afdb34f9297e1 100644
--- a/tests/validate_simpletypes2_sup.py
+++ b/tests/validate_simpletypes2_sup.py
@@ -370,10 +370,10 @@ except ImportError as exp:
return instring
@staticmethod
def convert_unicode(instring):
- if (type(instring) is str or
- (sys.version_info.major == 2
- and type(instring) == unicode)):
+ if isinstance(instring, str):
result = quote_xml(instring)
+ elif sys.version_info.major == 2 and isinstance(instring, unicode):
+ result = quote_xml(instring).encode('utf8')
else:
result = GeneratedsSuper.gds_encode(str(instring))
return result