Merge pull request #22 from tosky/store-line-number

Expose the line number in the parsed content

Author: cnsnyder

iniparse/ini.py

@@ -282,10 +282,15 @@ def set_value(self, data):
             else:
                 self.add(EmptyLine())
 
+    def get_line_number(self):
+       return self.contents[0].line_number if self.contents else None
+
     name = property(get_name, set_name)
 
     value = property(get_value, set_value)
 
+    line_number = property(get_line_number)
+
     def __str__(self):
         s = [x.__str__() for x in self.contents]
         return '\n'.join(s)
@@ -568,7 +573,6 @@ def _readfp(self, fp):
 
             line_obj = self._parse(line)
             line_count += 1
-
             if not cur_section and not isinstance(line_obj, (CommentLine, EmptyLine, SectionLine)):
                 if self._parse_exc:
                     raise MissingSectionHeaderError(fname, line_count, line)
@@ -644,6 +648,9 @@ def _readfp(self, fp):
                 if isinstance(line_obj, EmptyLine):
                     pending_empty_lines = True
 
+            if line_obj:
+                line_obj.line_number = line_count
+
         self._data.extend(pending_lines)
         if line and line[-1] == '\n':
             self._data.add(EmptyLine())

tests/test_ini.py

@@ -201,10 +201,15 @@ class TestIni(unittest.TestCase):
     def test_basic(self):
         sio = StringIO(self.s1)
         p = ini.INIConfig(sio)
-        self.assertEqual(str(p), self.s1)
-        self.assertEqual(p._data.find('section1').find('but').value, 'also me')
-        self.assertEqual(p._data.find('section1').find('help').value, 'yourself')
-        self.assertEqual(p._data.find('section2').find('just').value, 'kidding')
+        section1_but = p._data.find('section1').find('but')
+        self.assertEqual(section1_but.value, 'also me')
+        self.assertEqual(section1_but.line_number, 14)
+        section1_help = p._data.find('section1').find('help')
+        self.assertEqual(section1_help.value, 'yourself')
+        self.assertEqual(section1_help.line_number, 13)
+        section2_just = p._data.find('section2').find('just')
+        self.assertEqual(section2_just.value, 'kidding')
+        self.assertEqual(section2_just.line_number, 10)
 
         itr = p._data.finditer('section1')
         v = next(itr)