From: Bob Halley <halley@dnspython.org>
Date: Fri, 11 Apr 2014 15:05:49 +0000 (-0700)
Subject: Do not put back an unescaped token.
X-Git-Tag: v1.12.0-py3~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16c12d48d1a2b6a14e6b63597e916533470ecc58;p=thirdparty%2Fdnspython.git

Do not put back an unescaped token.
---

diff --git a/ChangeLog b/ChangeLog
index ed81d986..33702821 100644
--- 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 6d194099..04c1ecf8 100644
--- 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()