Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Sun, 10 Feb 2013 14:36:52 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 10 Feb 2013 14:36:52 +0100
- changeset 2397
- 671d0d55e5c8
- parent 2396
- 89475661e400 (diff)
- parent 2395
- 47bfeebe95f9 (current diff)
- child 2400
- c1726b754f96
Merged remote changes.
--- a/Utilities/ModuleParser.py Sun Feb 10 11:57:37 2013 +0100 +++ b/Utilities/ModuleParser.py Sun Feb 10 14:36:52 2013 +0100 @@ -164,12 +164,12 @@ ) | (?P<Import> - ^ (?: import | from [ \t]+ \. [ \t]+ import ) [ \t]+ + ^ [ \t]* (?: import | from [ \t]+ \. [ \t]+ import ) [ \t]+ (?P<ImportList> (?: [^#;\\\n]+ (?: \\\n )* )* ) ) | (?P<ImportFrom> - ^ from [ \t]+ + ^ [ \t]* from [ \t]+ (?P<ImportFromPath> \.* \w+ (?:
