From: Bob Halley <halley@nominum.com>
Date: Tue, 12 Jan 2010 23:19:27 +0000 (-0800)
Subject: actually set has_escape correctly when building tokens with escapes
X-Git-Tag: v1.8.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f767791da2fefdfcd3e05fcff06e64925850f428;p=thirdparty%2Fdnspython.git

actually set has_escape correctly when building tokens with escapes
---

diff --git a/dns/tokenizer.py b/dns/tokenizer.py
index 8253e043..237d656a 100644
--- a/dns/tokenizer.py
+++ b/dns/tokenizer.py
@@ -386,7 +386,7 @@ class Tokenizer(object):
             if self.multiline:
                 raise dns.exception.SyntaxError, 'unbalanced parentheses'
             ttype = EOF
-        return Token(ttype, token)
+        return Token(ttype, token, has_escape)
 
     def unget(self, token):
         """Unget a token.
diff --git a/tests/tokenizer.py b/tests/tokenizer.py
index 29146eb7..4950db03 100644
--- a/tests/tokenizer.py
+++ b/tests/tokenizer.py
@@ -162,11 +162,6 @@ class TokenizerTestCase(unittest.TestCase):
         self.failUnless(t.ttype == dns.tokenizer.IDENTIFIER and t.value == r'ch\ ld')
 
     def testEscapedDelimiter2(self):
-        tok = dns.tokenizer.Tokenizer(r'ch\0ld')
-        t = tok.get()
-        self.failUnless(t.ttype == dns.tokenizer.IDENTIFIER and t.value == r'ch\0ld')
-
-    def testEscapedDelimiter3(self):
         tok = dns.tokenizer.Tokenizer(r'ch\032ld')
         t = tok.get()
         self.failUnless(t.ttype == dns.tokenizer.IDENTIFIER and t.value == r'ch\032ld')
@@ -174,17 +169,12 @@ class TokenizerTestCase(unittest.TestCase):
     def testEscapedDelimiter1u(self):
         tok = dns.tokenizer.Tokenizer(r'ch\ ld')
         t = tok.get().unescape()
-        self.failUnless(t.ttype == dns.tokenizer.IDENTIFIER and t.value == r'ch\ ld')
+        self.failUnless(t.ttype == dns.tokenizer.IDENTIFIER and t.value == r'ch ld')
 
     def testEscapedDelimiter2u(self):
-        tok = dns.tokenizer.Tokenizer(r'ch\0ld')
-        t = tok.get().unescape()
-        self.failUnless(t.ttype == dns.tokenizer.IDENTIFIER and t.value == r'ch\0ld')
-
-    def testEscapedDelimiter3u(self):
         tok = dns.tokenizer.Tokenizer(r'ch\032ld')
         t = tok.get().unescape()
-        self.failUnless(t.ttype == dns.tokenizer.IDENTIFIER and t.value == r'ch\032ld')
+        self.failUnless(t.ttype == dns.tokenizer.IDENTIFIER and t.value == 'ch ld')
 
 if __name__ == '__main__':
     unittest.main()