aboutsummaryrefslogtreecommitdiff
path: root/mammoth/options.py
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-11-24 22:13:00 +0000
committerMichael Williamson <mike@zwobble.org>2016-11-24 22:15:35 +0000
commitc8516d0a4e9467d4313af4ba63196bca184812b3 (patch)
treedd6235081faf3e3fba7ddda3535d6c48654fb781 /mammoth/options.py
parent507700470b46329ea8b1f8191e48fa69a24a8deb (diff)
Use recursive descent parser instead of parsimonious
Diffstat (limited to 'mammoth/options.py')
-rw-r--r--mammoth/options.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mammoth/options.py b/mammoth/options.py
index d33b7ba..fcdba74 100644
--- a/mammoth/options.py
+++ b/mammoth/options.py
@@ -1,4 +1,5 @@
-from . import style_reader, lists, results
+from .styles.parser import read_style_mapping
+from . import lists, results
def read_options(options):
@@ -24,7 +25,7 @@ def read_options(options):
def _read_style_map(style_text):
lines = filter(None, map(_get_line, style_text.split("\n")))
- return results.combine(lists.map(style_reader.read_style, lines)) \
+ return results.combine(lists.map(read_style_mapping, lines)) \
.map(lambda style_mappings: lists.filter(None, style_mappings))