Merge lp:~shevonar/widelands-website/bug1202301 into lp:widelands-website

Proposed by Shevonar
Status: Merged
Merged at revision: 363
Proposed branch: lp:~shevonar/widelands-website/bug1202301
Merge into: lp:widelands-website
Diff against target: 12 lines (+2/-0)
1 file modified
widelandslib/conf.py (+2/-0)
To merge this branch: bzr merge lp:~shevonar/widelands-website/bug1202301
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+175470@code.launchpad.net

Description of the change

This should fix bug 1202301. However, I could not test it because I messed up my widelands-website installation when updating to current trunk. I tested the WidelandsConfigParser and it can now handle the % symbol in config files properly.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'widelandslib/conf.py'
--- widelandslib/conf.py 2010-11-01 17:52:47 +0000
+++ widelandslib/conf.py 2013-07-18 08:25:30 +0000
@@ -30,6 +30,8 @@
30 except AttributeError:30 except AttributeError:
31 string = open(fn, "r").read()31 string = open(fn, "r").read()
3232
33 string = string.replace('%', "%%")
34
33 try:35 try:
34 self.readfp(cStringIO.StringIO(string))36 self.readfp(cStringIO.StringIO(string))
35 except MissingSectionHeaderError:37 except MissingSectionHeaderError:

Subscribers

People subscribed via source and target branches