Do not put back an unescaped token.

diff --git a/ChangeLog b/ChangeLog
index ed81d9862906a91562ff8ce4708beb02ab60a1e8..3370282140cc86f6611b79f2352a421fe62166c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-11  Bob Halley  <halley@dnspython.org>
+
+       * dns/zone.py: Do not put back an unescaped token.  This was
+         causing escape processing for domain names to break.  Thanks to
+         connormclaud for reporting the problem.
+
 2014-04-04  Bob Halley  <halley@dnspython.org>
 
        * dns/message.py: Making a response didn't work correctly if the

diff --git a/dns/zone.py b/dns/zone.py
index 6d19409932608b03fa6d00b9f9cf9201453bda0d..04c1ecf83f5746d4741e3c837d44dbac1bc451b8 100644 (file)
--- a/dns/zone.py
+++ b/dns/zone.py
@@ -798,7 +798,7 @@ class _MasterReader(object):
 
         try:
             while 1:
-                token = self.tok.get(True, True).unescape()
+                token = self.tok.get(True, True)
                 if token.is_eof():
                     if not self.current_file is None:
                         self.current_file.close()