Merge lp:~jerith/renamer/empty-config-lines into lp:renamer

[Jeremy Thurgood]

No test updates, because there aren't any around this code.

[Tristan Seligmann (mithrandi)]

Since everything probably wants to operate on a stripped line, how about doing "line = line.strip()" instead of stripping it everywhere it's used?

Also, this is out of scope for this branch, but since it's a trivial change, how about skipping lines when line.startswith('#')?

review: Needs Fixing

[Jeremy Thurgood (jerith)]

I considered both of those, but rather than adding any more (even trivial) complexity, I'd prefer to replace the parser completely.

If I do the stripping, I'd prefer to do it after the split (so as to allow more natural setting of variables), but at that point we should probably use something like ConfigParser instead of the fragile splitting of lines we have now.

[Tristan Seligmann (mithrandi)]

If we're planning to replace the parser, then sure, let's not bother with any more work here; but please file a bug report about replacing the parser in that case.

review: Approve

=== modified file 'renamer/plugin.py'
--- renamer/plugin.py	2009-05-03 19:37:09 +0000
+++ renamer/plugin.py	2010-07-19 18:08:44 +0000
@@ -68,6 +68,8 @@
         config = {}
         if fd is not None:
             for line in fd:
+                if not line.strip():
+                    continue
                 key, value = line.strip().split('=', 1)
                 config[key] = value