Skip to content

Commit

Permalink
WIP: ruff check manual fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
awdem committed Nov 19, 2024
1 parent 5d4dafa commit 0c634aa
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
8 changes: 8 additions & 0 deletions eco_parser/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@
TableParser,
)
from eco_parser.parser import EcoParser

__all__ = [
'ParseError',
'BodyParser',
'ElementParserFactory',
'TableParser',
'EcoParser',
]
3 changes: 1 addition & 2 deletions eco_parser/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ def get_single_element(parent, tag):

def get_child_text(parent):
text = "".join(parent.itertext())
text = re.sub("\s+", " ", text).strip()
return text
return re.sub("\s+", " ", text).strip()
8 changes: 4 additions & 4 deletions eco_parser/element_parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@ def parse_body(self):
table_format = self.get_table_format(tbody)
if table_format == self.FORMAT_ONE_ROW_PARA:
return self.parse_one_row_table(tbody)
elif table_format == self.FORMAT_STANDARD_TABLE:
if table_format == self.FORMAT_STANDARD_TABLE:
return self.parse_standard_table(tbody)
elif table_format == self.FORMAT_UNKNOWN:
if table_format == self.FORMAT_UNKNOWN:
raise ParseError("Could not detect table format", 0)
return None

def parse(self):
try:
Expand All @@ -107,5 +108,4 @@ def create(element):
except ParseError as e:
if e.matches == 0:
return BodyParser(element)
else:
raise
raise e
10 changes: 5 additions & 5 deletions eco_parser/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ def parse(self):
article_pattern = r"http[s]?\:\/\/(www\.)?legislation\.gov\.uk\/(.)+\/article\/(.)+\/data\.xml"
if re.match(schedule_pattern, self.url):
return self.parse_schedule()
elif re.match(article_pattern, self.url):
if re.match(article_pattern, self.url):
return self.parse_article()
else:
raise ParseError(
"Could not find a suitable parser for %s" % (self.url), 0
)

raise ParseError(
"Could not find a suitable parser for %s" % (self.url), 0
)
7 changes: 4 additions & 3 deletions tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ def get_data(self):
dirname = os.path.dirname(os.path.abspath(__file__))
file_path = os.path.abspath(os.path.join(dirname, fixtures[self.url]))
if self.url in fixtures:
return bytes(open(file_path, "r").read(), "utf-8")
else:
raise Exception("no test fixture defined for url '%s'" % self.url)
with open(file_path, "r", encoding="utf-8") as file:
return bytes(file.read(), "utf-8")

raise Exception("no test fixture defined for url '%s'" % self.url)


class ParserTest(unittest.TestCase):
Expand Down

0 comments on commit 0c634aa

Please sign in to comment.