Merge pull request venmo#18 from yoyowallet/consistent-imports

Use relative imports

business_rules/engine.py

@@ -1,10 +1,10 @@
 import inspect
 import logging
 
-import utils
-from business_rules.models import ConditionResult
-from util import method_type
+from . import utils
 from .fields import FIELD_NO_INPUT
+from .models import ConditionResult
+from .util import method_type
 
 logger = logging.getLogger(__name__)
 

business_rules/operators.py

@@ -1,15 +1,16 @@
+import calendar
 import inspect
 import re
+from datetime import date, datetime, time
 from decimal import Decimal
 from functools import wraps
-from datetime import datetime, date, time
-from six import string_types, integer_types
-import calendar
 
-from .fields import (
-    FIELD_TEXT, FIELD_NUMERIC, FIELD_NO_INPUT, FIELD_SELECT, FIELD_SELECT_MULTIPLE, FIELD_DATETIME, FIELD_TIME
-)
-from .utils import fn_name_to_pretty_label, float_to_decimal
+from six import integer_types, string_types
+
+from .fields import (FIELD_DATETIME, FIELD_NO_INPUT, FIELD_NUMERIC,
+                     FIELD_SELECT, FIELD_SELECT_MULTIPLE, FIELD_TEXT,
+                     FIELD_TIME)
+from .utils import float_to_decimal, fn_name_to_pretty_label
 
 
 class BaseType(object):

business_rules/utils.py

@@ -1,8 +1,7 @@
 import inspect
-from decimal import Decimal, Inexact, Context
+from decimal import Context, Decimal, Inexact
 
-import fields, engine
-from util import method_type
+from .util import method_type
 
 
 def fn_name_to_pretty_label(name):
@@ -56,6 +55,8 @@ def float_to_decimal(f):
 
 
 def get_valid_fields():
+    from . import fields
+
     valid_fields = [getattr(fields, f) for f in dir(fields) if f.startswith("FIELD_")]
     return valid_fields
 

business_rules/variables.py

@@ -1,18 +1,10 @@
 import inspect
 
-from typing import List, Callable, Type
-
-import utils
-from .operators import (
-    BaseType,
-    NumericType,
-    StringType,
-    BooleanType,
-    SelectType,
-    SelectMultipleType,
-    DateTimeType,
-    TimeType,
-)
+from typing import Callable, List, Type  # noqa: F401
+
+from . import utils
+from .operators import (BaseType, BooleanType, DateTimeType, NumericType,
+                        SelectMultipleType, SelectType, StringType, TimeType)
 from .utils import fn_name_to_pretty_label