Merge lp:~mvo/aptdaemon/multiline-comments-fix into lp:aptdaemon

[Michael Vogt]

Support multi line comments

[Martin Pitt (pitti)]

Looks fine to me.

review: Approve

=== modified file 'aptdaemon/config.py'
--- aptdaemon/config.py	2012-05-08 18:50:57 +0000
+++ aptdaemon/config.py	2012-11-28 13:14:22 +0000
@@ -88,10 +88,15 @@
         level = 0
         for line_no, line in enumerate(lines):
             for char_no, char in enumerate(line):
-                if in_comment and char == "/" and prev_char == "*":
+                if not in_comment and char == "*" and prev_char == "/":
+                    in_comment = True
+                    prev_char = ""
+                    continue
+                elif in_comment and char == "/" and prev_char == "*":
                     # A multiline comment was closed
                     in_comment = False
                     prev_char = ""
+                    option_name = option_name[:-1]
                     continue
                 elif in_comment:
                     # We ignore the content of multiline comments
@@ -153,7 +158,8 @@
                         option_name = ""
                         in_brackets = False
                 else:
-                    raise Exception("Unknown char '%s' in: %s" % (char, line))
+                    raise ValueError("Unknown char '%s' in line: '%s'" % (
+                            char, line))
                 prev_char = char
         return options
 

=== modified file 'tests/test_configparser.py'
--- tests/test_configparser.py	2012-05-12 16:04:00 +0000
+++ tests/test_configparser.py	2012-11-28 13:14:22 +0000
@@ -51,6 +51,18 @@
         self.assertEqual(cf["apt::changelogs::server"].string,
                           "http://changelogs.ubuntu.com/changelogs")
 
+    def test_multi_line_comments(self):
+        s = """/*
+ * APT configuration file for Zope Debian packages.
+ */
+
+DPkg {
+	Post-Invoke {"which dzhandle";};
+}
+        """
+        cf = self.parser.parse(s.split("\n"))
+        self.assertEqual(cf["dpkg::post-invoke"][0].string, "which dzhandle")
+
     def test_(self):
         config = {}
         config_check = {}