Fix deprecated use of '\' as described in https://bugs.python.org/issue27364 (Deprecated in Python 3.6, will become SyntaxError in a future release)

git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@456 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b

2 files changed, 7 insertions, 7 deletions

diff --git a/src/pyparsing.py b/src/pyparsing.py
index 8a02b63..933cf63 100644
--- a/src/pyparsing.py
+++ b/src/pyparsing.py
@@ -144,7 +144,7 @@ else:
         except UnicodeEncodeError:

             # Else encode it

             ret = unicode(obj).encode(sys.getdefaultencoding(), 'xmlcharrefreplace')

-            xmlcharref = Regex('&#\d+;')

+            xmlcharref = Regex(r'&#\d+;')

             xmlcharref.setParseAction(lambda t: '\\u' + hex(int(t[0][2:-1]))[2:])

             return xmlcharref.transformString(ret)

 

@@ -809,7 +809,7 @@ class ParseResults(object):
         return None

 

     def getName(self):

-        """

+        r"""

         Returns the results name for this token expression. Useful when several 

         different expressions might match at a particular location.

 

@@ -2737,7 +2737,7 @@ class Word(Token):
 

 

 class Regex(Token):

-    """

+    r"""

     Token for matching strings that match a given regular expression.

     Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.

     If the given regex contains named groups (defined using C{(?P<name>...)}), these will be preserved as 

@@ -2926,7 +2926,7 @@ class QuotedString(Token):
 

                 # replace escaped characters

                 if self.escChar:

-                    ret = re.sub(self.escCharReplacePattern,"\g<1>",ret)

+                    ret = re.sub(self.escCharReplacePattern, r"\g<1>", ret)

 

                 # replace escaped quotes

                 if self.escQuote:

diff --git a/src/unitTests.py b/src/unitTests.py
index 0d45390..e20de50 100644
--- a/src/unitTests.py
+++ b/src/unitTests.py
@@ -933,10 +933,10 @@ class ReStringRangeTest(ParseTestCase):
             "ABCDEFGHIJKLMNOPQRSTUVWXYZ",

             "A",

             "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",

-            "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz",

-            " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~",

+            "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz",

+            " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",

             " !\"#$%&'()*+,-./0",

-            "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~",

+            "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",

             #~ "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ",

             u'\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe',

             " !\"#$%&'()*+,-./0",