From bf27c453269d2a6958cb4b96d78a2cdebcfbdf81 Mon Sep 17 00:00:00 2001 From: Bobby Date: Wed, 31 Aug 2022 15:29:02 -0400 Subject: refactor code --- src/edify/builder/__init__.py | 2 ++ src/edify/builder/builder.py | 1 + tests/test_builder.py | 8 ++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/edify/builder/__init__.py b/src/edify/builder/__init__.py index 44490b2..ba3b776 100644 --- a/src/edify/builder/__init__.py +++ b/src/edify/builder/__init__.py @@ -1,3 +1,5 @@ +# flake8: noqa + from .builder import RegexBuilder from .constants import * from .escaped import Escaped diff --git a/src/edify/builder/builder.py b/src/edify/builder/builder.py index 3087991..5c10288 100644 --- a/src/edify/builder/builder.py +++ b/src/edify/builder/builder.py @@ -1,5 +1,6 @@ from .abc import Builder + class RegexBuilder(Builder): def __init__(self): self.parts = [] diff --git a/tests/test_builder.py b/tests/test_builder.py index 7b43d7c..b6f6e20 100644 --- a/tests/test_builder.py +++ b/tests/test_builder.py @@ -1,6 +1,8 @@ import re -from edify.builder import ANY, WORD, DIGIT +from edify.builder import ANY +from edify.builder import DIGIT +from edify.builder import WORD from edify.builder import AtLeast from edify.builder import AtMost from edify.builder import Escaped @@ -11,12 +13,14 @@ from edify.builder import Range from edify.builder import RegexBuilder from edify.builder import ZeroOrMore + def catch_exception(subroutine): try: subroutine() except Exception as e: return e.__class__ + def test_invalid_section_error(): assert catch_exception(lambda: RegexBuilder().add(1)) is ValueError @@ -116,6 +120,7 @@ def test_escaped_with_quantifier(): assert re.match(regex, "...") is not None assert re.match(regex, "....") is not None + def test_escaped_with_quantifier_and_optional(): regex = ( RegexBuilder() @@ -142,4 +147,3 @@ def test_email_using_builder(): ) assert re.match(regex, "hello@example.com") is not None assert re.match(regex, "hello@example") is None - -- cgit v1.2.3