Merge a95cb8e into c6f56ed

nose-devs · Oct 9, 2018 · 6368d9a · 6368d9a
2 parents c6f56ed + a95cb8e
commit 6368d9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/nose2/plugins/junitxml.py b/nose2/plugins/junitxml.py
@@ -248,15 +248,6 @@ def _time(self):
 # xml utility functions
 #
 
-# six doesn't include a unichr function
-
-
-def _unichr(string):
-    if six.PY3:
-        return chr(string)
-    else:
-        return unichr(string)
-
 # etree outputs XML 1.0 so the 1.1 Restricted characters are invalid.
 # and there are no characters that can be given as entities aside
 # form & < > ' " which ever have to be escaped (etree handles these fine)
@@ -281,12 +272,12 @@ def _unichr(string):
 
 ILLEGAL_REGEX_STR = \
     six.u('[') + \
-    six.u('').join(["%s-%s" % (_unichr(l), _unichr(h))
+    six.u('').join(["%s-%s" % (six.unichr(l), six.unichr(h))
                     for (l, h) in ILLEGAL_RANGES]) + \
     six.u(']')
 RESTRICTED_REGEX_STR = \
     six.u('[') + \
-    six.u('').join(["%s-%s" % (_unichr(l), _unichr(h))
+    six.u('').join(["%s-%s" % (six.unichr(l), six.unichr(h))
                     for (l, h) in RESTRICTED_RANGES]) + \
     six.u(']')
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-six>=1.7
-coverage>=4.4.1
+coverage>=4.5.1
+six>=1.11.0