Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent NoneType errors with the regex matching #70

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions pycrfsuite/_dumpparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,41 @@ def feed(self, line):

def parse_FILEHEADER(self, line):
m = re.match("(\w+): (.*)", line)
self.result.header[m.group(1)] = m.group(2)
if m:
self.result.header[m.group(1)] = m.group(2)
else:
self.result.header = None

def parse_LABELS(self, line):
m = re.match("(\d+): (.*)", line)
self.result.labels[m.group(2)] = m.group(1)
if m:
self.result.labels[m.group(2)] = m.group(1)
else:
self.result.labels = None

def parse_ATTRIBUTES(self, line):
m = re.match("(\d+): (.*)", line)
self.result.attributes[m.group(2)] = m.group(1)
if m:
self.result.attributes[m.group(2)] = m.group(1)
else:
self.result.attributes = None

def parse_TRANSITIONS(self, line):
m = re.match(r"\(\d+\) (.+) --> (.+): ([+-]?\d+\.\d+)", line)
from_, to_ = m.group(1), m.group(2)
assert from_ in self.result.labels
assert to_ in self.result.labels
self.result.transitions[(from_, to_)] = float(m.group(3))
if m:
from_, to_ = m.group(1), m.group(2)
assert from_ in self.result.labels
assert to_ in self.result.labels
self.result.transitions[(from_, to_)] = float(m.group(3))
else:
self.result.transitions = None

def parse_STATE_FEATURES(self, line):
m = re.match(r"\(\d+\) (.+) --> (.+): ([+-]?\d+\.\d+)", line)
attr, label = m.group(1), m.group(2)
assert attr in self.result.attributes
assert label in self.result.labels
self.result.state_features[(attr, label)] = float(m.group(3))
if m:
attr, label = m.group(1), m.group(2)
assert attr in self.result.attributes
assert label in self.result.labels
self.result.state_features[(attr, label)] = float(m.group(3))
else:
self.result.state_features = None