Some quick touch-ups in Yang's quoting code - and a changelog entry

svn path=/trunk/packages/invirt-dns/; revision=1631

diff --git a/debian/changelog b/debian/changelog
index ff67d88..9a46bc5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-dns (0.0.7) unstable; urgency=low
+
+  [ Yang Zhang ]
+  * Do a better job of handling quoting
+
+ -- Evan Broder <broder@mit.edu>  Wed, 12 Nov 2008 18:48:50 -0500
+

 invirt-dns (0.0.6) unstable; urgency=low
 
   * Add support for basic quoting in the zone file
 invirt-dns (0.0.6) unstable; urgency=low
 
   * Add support for basic quoting in the zone file

diff --git a/invirt-dns b/invirt-dns
index b2a9ac6..e49c279 100755 (executable)
--- a/invirt-dns
+++ b/invirt-dns
@@ -155,9 +155,9 @@ class QuotingBindAuthority(authority.BindAuthority):
         for line in lines:
             in_quote = False
             split_line = []
         for line in lines:
             in_quote = False
             split_line = []

-            for m in string_pat.finditer(line):
+            for m in self.string_pat.finditer(line):

                 [x] = [x for x in m.groups() if x is not None]
                 [x] = [x for x in m.groups() if x is not None]

-                split_line.append(escape_pat.sub(r'\1', x))
+                split_line.append(self.escape_pat.sub(r'\1', x))

             L.append(split_line)
         return filter(None, L)
 
             L.append(split_line)
         return filter(None, L)