1.1 --- a/moinformat/__init__.py Mon Jul 16 11:11:34 2018 +0200
1.2 +++ b/moinformat/__init__.py Mon Jul 16 11:38:31 2018 +0200
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 Moin wiki format tools.
1.6
1.7 -Copyright (C) 2017 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2017, 2018 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -19,7 +19,7 @@
1.13 this program. If not, see <http://www.gnu.org/licenses/>.
1.14 """
1.15
1.16 -from moinformat.parsers import parse, parsers
1.17 -from moinformat.serialisers import serialise, serialisers
1.18 +from moinformat.parsers import parse, parsers as all_parsers
1.19 +from moinformat.serialisers import serialise, serialisers as all_serialisers
1.20
1.21 # vim: tabstop=4 expandtab shiftwidth=4
2.1 --- a/tests/test_parser.py Mon Jul 16 11:11:34 2018 +0200
2.2 +++ b/tests/test_parser.py Mon Jul 16 11:38:31 2018 +0200
2.3 @@ -12,11 +12,11 @@
2.4 if split(parent)[1] == "MoinLight":
2.5 sys.path.append(parent)
2.6
2.7 -from moinformat import parse, parsers, serialise, serialisers
2.8 +from moinformat import all_parsers, all_serialisers, parse, serialise
2.9 from glob import glob
2.10
2.11 def test_input(s):
2.12 - d = parse(s, parsers)
2.13 + d = parse(s, all_parsers)
2.14 o = serialise(d)
2.15
2.16 identical = o == s
2.17 @@ -33,7 +33,7 @@
2.18 print "-" * 60
2.19 print s
2.20 print "-" * 60
2.21 - print serialise(d, serialisers["html"])
2.22 + print serialise(d, all_serialisers["html"])
2.23 print "-" * 60
2.24 print d.prettyprint()
2.25 print