bugfix for importing nested handlers

Author: amancevice

Makefile

@@ -2,9 +2,9 @@ SDIST   := dist/$(shell python setup.py --fullname).tar.gz
 SLEEP   := 0
 TIMEOUT := 3
 
-.PHONY: default clean test up upload
+.PHONY: all clean test up upload
 
-default: $(SDIST)
+all: $(SDIST)
 
 clean:
 	rm -rf dist
@@ -17,7 +17,7 @@ upload: $(SDIST)
 up:
 	SLEEP=$(SLEEP) python -m lambda_gateway -t $(TIMEOUT) lambda_function.lambda_handler
 
-coverage.xml: $(shell find . -name '*.py' -not -path './.*')
+coverage.xml: $(shell find lambda_gateway tests -name '*.py')
 	flake8 $^
 	pytest
 

lambda_gateway/event_proxy.py

@@ -1,7 +1,8 @@
 import asyncio
+import importlib
 import json
 import os
-from importlib.util import (spec_from_file_location, module_from_spec)
+import sys
 
 from lambda_gateway import (lambda_context, logger)
 
@@ -23,12 +24,11 @@ def get_handler(self):
         if not name:
             raise ValueError(f"Bad handler signature '{self.handler}'")
         try:
-            pypath = os.path.join(os.path.curdir, f'{name}.py')
-            spec = spec_from_file_location(name, pypath)
-            module = module_from_spec(spec)
-            spec.loader.exec_module(module)
-            return getattr(module, func)
-        except FileNotFoundError:
+            sys.path.append(os.path.curdir)
+            module = importlib.import_module(name)
+            handler = getattr(module, func)
+            return handler
+        except ModuleNotFoundError:
             raise ValueError(f"Unable to import module '{name}'")
         except AttributeError:
             raise ValueError(f"Handler '{func}' missing on module '{name}'")