diff options
| author | Bob Halley <halley@nominum.com> | 2010-01-12 15:19:27 -0800 |
|---|---|---|
| committer | Bob Halley <halley@nominum.com> | 2010-01-12 15:19:27 -0800 |
| commit | f767791da2fefdfcd3e05fcff06e64925850f428 (patch) | |
| tree | b436c62eaafc5c42dde135f1343961648aa842f9 | |
| parent | f3e9aa06b282570b0fadda772663d50c61c4edea (diff) | |
| download | dnspython-f767791da2fefdfcd3e05fcff06e64925850f428.tar.gz | |
actually set has_escape correctly when building tokens with escapes
| -rw-r--r-- | dns/tokenizer.py | 2 | ||||
| -rw-r--r-- | tests/tokenizer.py | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/dns/tokenizer.py b/dns/tokenizer.py index 8253e04..237d656 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 29146eb..4950db0 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() |