summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Halley <halley@dnspython.org>2014-04-11 08:04:45 -0700
committerBob Halley <halley@dnspython.org>2014-04-11 08:04:45 -0700
commit1c8b777f3f0a9881f8286127d1e42b01e95876c4 (patch)
treeaaea1a8512bde3e7ff25197aa21d84b755561838
parent2db54ba975ed5be22f92af105bb2bd6b0ccbbef1 (diff)
downloaddnspython-1c8b777f3f0a9881f8286127d1e42b01e95876c4.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 6654bb1..b413572 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 9efcf43..ab57148 100644
--- a/dns/zone.py
+++ b/dns/zone.py
@@ -813,7 +813,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()