fixing bug with passing an incorrect variable to call

Author: docmarionum1

geosupport/function_info.py

@@ -26,7 +26,7 @@ def __contains__(self, name):
         )
 
 def load_function_info():
-    FUNCTIONS = FunctionDict()
+    functions = FunctionDict()
 
     alt_names = {}
 
@@ -52,21 +52,21 @@ def load_function_info():
 
             row['inputs'] = []
 
-            FUNCTIONS[function] = row
+            functions[function] = row
 
-    FUNCTIONS.alt_names = alt_names
+    functions.alt_names = alt_names
 
     with open(FUNCTION_INPUTS_CSV) as f:
         csv = DictReader(f)
 
         for row in csv:
             if row['function']:
-                FUNCTIONS[row['function']]['inputs'].append({
+                functions[row['function']]['inputs'].append({
                     'name': row['field'],
                     'comment': row['comments']
                 })
 
-    return FUNCTIONS
+    return functions
 
 def list_functions():
     s = sorted([
@@ -139,13 +139,13 @@ def input_help():
     return '\n'.join(s)
 
 def load_work_area_layouts():
-    WORK_AREA_LAYOUTS = {}
-    INPUT = []
+    work_area_layouts = {}
+    inputs = []
 
     for csv in glob.glob(path.join(WORK_AREA_LAYOUTS_PATH, '*', '*.csv')):
         directory = path.basename(path.dirname(csv))
-        if directory not in WORK_AREA_LAYOUTS:
-            WORK_AREA_LAYOUTS[directory] = {}
+        if directory not in work_area_layouts:
+            work_area_layouts[directory] = {}
 
         layout = {}
         name = path.basename(csv).split('.')[0]
@@ -159,7 +159,7 @@ def load_work_area_layouts():
 
         functions = functions.split('_')
         for function in functions:
-            WORK_AREA_LAYOUTS[directory][function + mode] = layout
+            work_area_layouts[directory][function + mode] = layout
 
         with open(csv) as f:
             rows = DictReader(f)
@@ -191,14 +191,14 @@ def load_work_area_layouts():
                     layout[n.lower()] = v
 
                 if directory == 'input':
-                    INPUT.append({
+                    inputs.append({
                         'name': name,
                         'alt_names': alt_names,
                         'functions': row['functions'],
                         'value': row['value']
                     })
 
-    return WORK_AREA_LAYOUTS, INPUT
+    return work_area_layouts, inputs
 
 MODES = ['regular', 'extended', 'long', 'long+tpad']
 AUXILIARY_SEGMENT_LENGTH = 500

geosupport/function_info/work_area_layouts/input/WA1.csv

@@ -7,15 +7,15 @@ Low House Number - Sort Format,11,46,56,"D*, Internal Use",,,,
 "B10SC-1 (includes Borough Code 1, B5SC-1 and B7SC-1):",11,57,67,See next 2 entries,,"borough, borough_1,b5sc,b5sc_1,b7sc,b7sc_1,b10sc,b10sc_1",borough,
 Borough Code-1,1,57,57,"Required for All Functions but BL, BN. Ignored if Fn 2 has Node Number input",,"borough_code, borough_code_1",borough,"'1'=Manhattan, '2'=Bronx, '3'=Brooklyn, '4'=Queens, '5'=Staten Island"
 10SC-1,10,58,67,"All but 1N, B*",,"street_code, street_code_1",,
-Street Name-1,32,68,99,"All but BL, BN, D*",,"street_name, street, street_name_1, on",,
+Street Name-1,32,68,99,"All but BL, BN, D*",,"street_name, street, street_name_1, on, street_1",,
 "B10SC-2 (includes Borough Code 2, B5SC-2 and B7SC-2):",11,100,110,"2, 3*, D*",,"borough_2,b5sc_2,b7sc_2,b10sc_2",borough,
 Borough Code-2,1,100,100,"2, 3*, D*",,borough_code_2,borough,"'1'=Manhattan, '2'=Bronx, '3'=Brooklyn, '4'=Queens, '5'=Staten Island"
 10SC-2,10,101,110,"2, 3*, D*",,street_code_2,,
-Street Name-2,32,111,142,"2, 3*",,"street_name_2, from",,
+Street Name-2,32,111,142,"2, 3*",,"street_name_2, from, street_2",,
 "B10SC-3 (includes Borough Code 3, B5SC-3 and B7SC-3):",11,143,153,"3*, D*",,"borough_3,b5sc_3,b7sc_3,b10sc_3",borough,
 Borough Code-3,1,143,143,"3*, D*",,borough_code_3,borough,"'1'=Manhattan, '2'=Bronx, '3'=Brooklyn, '4'=Queens, '5'=Staten Island"
 10SC-3,10,144,153,"3*, D*",,street_code_3,,
-Street Name-3,32,154,185,3*,,"street_name_3, to",,
+Street Name-3,32,154,185,3*,,"street_name_3, to, street_3",,
 BOROUGH BLOCK LOT (BBL),10,186,195,BL,,bbl,,
 Borough Code,1,186,186,BL,,bbl_borough,,
 Tax Block,5,187,191,BL,,bbl_block,,

geosupport/geosupport.py

@@ -59,7 +59,9 @@ def _call_geolib(self, wa1, wa2):
 
         return wa1, wa2
 
-    def call(self, kwargs_dict={}, mode=None, **kwargs):
+    def call(self, kwargs_dict=None, mode=None, **kwargs):
+        if kwargs_dict is None:
+            kwargs_dict = {}
         kwargs_dict.update(kwargs)
         kwargs_dict.update(set_mode(mode))
 

geosupport/io.py

@@ -1,6 +1,4 @@
 from functools import partial
-import glob
-from os import path
 
 from .config import BOROUGHS
 from .error import GeosupportError
@@ -143,7 +141,7 @@ def create_wa1(kwargs):
 
     layout = WORK_AREA_LAYOUTS['input']['WA1']
 
-    for key,value in kwargs.items():
+    for key, value in kwargs.items():
         formatter = get_formatter(layout[key]['formatter'])
         value = '' if value is None else str(formatter(value))
 
@@ -160,7 +158,7 @@ def create_wa2(flags):
         return None
 
     if flags['auxseg']:
-       length += AUXILIARY_SEGMENT_LENGTH
+        length += AUXILIARY_SEGMENT_LENGTH
 
     return ' ' * length
 
@@ -199,13 +197,13 @@ def parse_output(flags, wa1, wa2):
 
     output.update(parse_workarea(WORK_AREA_LAYOUTS['output']['WA1'], wa1))
 
-    function = flags['function']
-    if function in WORK_AREA_LAYOUTS['output']:
+    function_name = flags['function']
+    if function_name in WORK_AREA_LAYOUTS['output']:
         output.update(parse_workarea(
-            WORK_AREA_LAYOUTS['output'][function], wa2
+            WORK_AREA_LAYOUTS['output'][function_name], wa2
         ))
 
-    function_mode = function + '-' + flags['mode']
+    function_mode = function_name + '-' + flags['mode']
     if function_mode in WORK_AREA_LAYOUTS['output']:
         output.update(parse_workarea(
             WORK_AREA_LAYOUTS['output'][function_mode], wa2

tests/functional/test_call_alternate.py

@@ -109,3 +109,18 @@ def test_call_invalid_function(self):
 
         with self.assertRaises(AttributeError):
             self.geosupport['fake']({})
+
+    def test_call_invalid_key(self):
+        with self.assertRaises(KeyError):
+            self.geosupport.intersection(
+                borough_code='BK', street1='east 19 st', street_2='ave h'
+            )
+
+        with self.assertRaises(KeyError):
+            self.geosupport.intersection(
+                borough_code='BK', street_1='east 19 st', street2='ave h'
+            )
+
+        self.geosupport.intersection(
+            borough_code='BK', street_name_1='east 19 st', street_name_2='ave h'
+        )