fixing 2.7 compatibility issues

Author: docmarionum1

geosupport/__init__.py

@@ -1 +1 @@
-from geosupport.geosupport import Geosupport
+from .geosupport import Geosupport

geosupport/function_info.py

@@ -2,7 +2,7 @@
 import glob
 from os import path
 
-from geosupport.config import FUNCTION_INFO_CSV, FUNCTION_INPUTS_CSV, WORK_AREA_LAYOUTS_PATH
+from .config import FUNCTION_INFO_CSV, FUNCTION_INPUTS_CSV, WORK_AREA_LAYOUTS_PATH
 
 class FunctionDict(dict):
 

geosupport/function_info/work_area_layouts/output/1A_BL_BN_AP-regular.csv

@@ -1,3 +1,3 @@
 name,size,from,to,comment,parent,alt_names,formatter
-Number of Entries in List of Geographic Identifiers ,4,247,250,Maximum of 21 entries,,,
+Number of Entries in List of Geographic Identifiers,4,247,250,Maximum of 21 entries,,,
 LIST OF GEOGRAPHIC IDENTIFIERS:,1113,251,1363,"Maximum of 21 entries, each 53 bytes long: 21x53 = 1,113",,,LGI

geosupport/geosupport.py

@@ -1,9 +1,9 @@
 from functools import partial
 import sys
 
-from geosupport.error import GeosupportError
-from geosupport.function_info import FUNCTIONS, function_help, list_functions, input_help
-from geosupport.io import format_input, parse_output, set_mode
+from .error import GeosupportError
+from .function_info import FUNCTIONS, function_help, list_functions, input_help
+from .io import format_input, parse_output, set_mode
 
 class Geosupport(object):
     def __init__(self):
@@ -41,7 +41,6 @@ def _call_geolib(self, wa1, wa2):
         """
         Calls the Geosupport libs & encodes/deocodes strings for Python 3.
         """
-
         # encode
         if self.py_version == 3:
             wa1 = bytes(str(wa1), 'utf8')

geosupport/io.py

@@ -2,11 +2,9 @@
 import glob
 from os import path
 
-import pandas as pd
-
-from geosupport.config import BOROUGHS
-from geosupport.error import GeosupportError
-from geosupport.function_info import (
+from .config import BOROUGHS
+from .error import GeosupportError
+from .function_info import (
     FUNCTIONS, AUXILIARY_SEGMENT_LENGTH, WORK_AREA_LAYOUTS
 )
 
@@ -153,7 +151,7 @@ def create_wa1(kwargs):
         length = i[1]-i[0]
         mv[i[0]:i[1]] = value.ljust(length)[:length].encode()
 
-    return b.decode()
+    return str(b.decode())
 
 def create_wa2(flags):
     length = FUNCTIONS[flags['function']][flags['mode']]

setup.py

@@ -30,7 +30,6 @@
     author='Ian Shiland',
     author_email='ishiland@gmail.com',
     packages=['geosupport'],
-    #package_data={'python-geosupport': ['geosupport/function_info/**']},
     include_package_data=True,
     license='MIT',
     keywords = ['NYC', 'geocoder', 'python-geosupport', 'geosupport'],
@@ -50,7 +49,8 @@
     test_suite="tests",
     extras_require={
         'dev': [
-            'invoke',
+            'coverage',
+            'invoke>=1.1.1',
             'nose'
         ]
     }

tasks.py

@@ -2,8 +2,8 @@
 
 nosetests = 'nosetests --with-coverage --cover-package=geosupport --cover-html --cover-branches --cover-erase'
 
-@task()
-def test(test_type):
+@task
+def test(context, test_type):
     if test_type == 'unit':
         cmd = ' '.join([nosetests, 'tests/unit/*'])
         run('sh -c "%s"' % cmd)
@@ -17,5 +17,5 @@ def test(test_type):
         print("Unknown test suite '%s'. Choose one of: unit, functional, all." % test_type)
 
 @task
-def pylint():
+def pylint(context):
     run('sh -c "pylint geosupport"')