# HG changeset patch # User Paul Boddie # Date 1531733911 -7200 # Node ID 008768d9e137efe8289018fb2a9406cf3ea083d5 # Parent 812c7cf49e7ed7b4762d19e08731720ec2a404ca Removed annoying re-use of module names. diff -r 812c7cf49e7e -r 008768d9e137 moinformat/__init__.py --- a/moinformat/__init__.py Mon Jul 16 11:11:34 2018 +0200 +++ b/moinformat/__init__.py Mon Jul 16 11:38:31 2018 +0200 @@ -3,7 +3,7 @@ """ Moin wiki format tools. -Copyright (C) 2017 Paul Boddie +Copyright (C) 2017, 2018 Paul Boddie This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -19,7 +19,7 @@ this program. If not, see . """ -from moinformat.parsers import parse, parsers -from moinformat.serialisers import serialise, serialisers +from moinformat.parsers import parse, parsers as all_parsers +from moinformat.serialisers import serialise, serialisers as all_serialisers # vim: tabstop=4 expandtab shiftwidth=4 diff -r 812c7cf49e7e -r 008768d9e137 tests/test_parser.py --- a/tests/test_parser.py Mon Jul 16 11:11:34 2018 +0200 +++ b/tests/test_parser.py Mon Jul 16 11:38:31 2018 +0200 @@ -12,11 +12,11 @@ if split(parent)[1] == "MoinLight": sys.path.append(parent) -from moinformat import parse, parsers, serialise, serialisers +from moinformat import all_parsers, all_serialisers, parse, serialise from glob import glob def test_input(s): - d = parse(s, parsers) + d = parse(s, all_parsers) o = serialise(d) identical = o == s @@ -33,7 +33,7 @@ print "-" * 60 print s print "-" * 60 - print serialise(d, serialisers["html"]) + print serialise(d, all_serialisers["html"]) print "-" * 60 print d.prettyprint() print