summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Halley <halley@dnspython.org>2014-04-11 08:05:49 -0700
committerBob Halley <halley@dnspython.org>2014-04-11 08:05:49 -0700
commit16c12d48d1a2b6a14e6b63597e916533470ecc58 (patch)
treec3aa47563be088050c9ae1f2cb92443c4ae104e5
parentc7b16bfeea84266936b04345fd65aff191ed126d (diff)
downloaddnspython-16c12d48d1a2b6a14e6b63597e916533470ecc58.tar.gz
Do not put back an unescaped token.
-rw-r--r--ChangeLog6
-rw-r--r--dns/zone.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ed81d98..3370282 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 6d19409..04c1ecf 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()