From 5bff8d5b195891f8bdca113a66d98f1bc18ffa3e Mon Sep 17 00:00:00 2001
From: Max <max@ira-labs.com>
Date: Tue, 27 Jun 2023 14:13:22 +0100
Subject: [PATCH] removed py36 compat stuff

---
 connectome/interface/compat.py         | 14 --------------
 connectome/interface/metaclasses.py    |  3 +--
 connectome/layers/base.py              |  2 +-
 tests/test_interface/test_interface.py |  3 ++-
 4 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 connectome/interface/compat.py

diff --git a/connectome/interface/compat.py b/connectome/interface/compat.py
deleted file mode 100644
index 8044d55..0000000
--- a/connectome/interface/compat.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import sys
-from typing import Generic
-
-SafeMeta = type
-
-if sys.version_info[:2] < (3, 7):
-    # Py3.6 has a custom metaclass for Generic, which causes a lot of problems
-    class SafeMeta(type):
-        def __getitem__(self, item):
-            return self
-
-
-    class Generic(metaclass=SafeMeta):
-        pass
diff --git a/connectome/interface/metaclasses.py b/connectome/interface/metaclasses.py
index 8611906..e7bf779 100644
--- a/connectome/interface/metaclasses.py
+++ b/connectome/interface/metaclasses.py
@@ -3,14 +3,13 @@
 
 from ..layers import CallableLayer, Layer
 from ..utils import MultiDict
-from .compat import SafeMeta
 from .factory import GraphFactory, SourceFactory, TransformFactory, add_from_mixins, add_quals, items_to_container
 
 logger = logging.getLogger(__name__)
 BASES: Dict[Type[Layer], GraphFactory] = {}
 
 
-class APIMeta(SafeMeta):
+class APIMeta(type):
     @classmethod
     def __prepare__(mcs, *args, **kwargs):
         return MultiDict()
diff --git a/connectome/layers/base.py b/connectome/layers/base.py
index ad23737..c4f1489 100644
--- a/connectome/layers/base.py
+++ b/connectome/layers/base.py
@@ -82,7 +82,7 @@ def _decorate(self, inputs: StringsLike, outputs: StringsLike = None, final: Str
         def decorator(func: Callable) -> Callable:
             loopback = self._container.loopback(func, inputs, outputs).compile()
             logger.info('Loopback compiled: %s', loopback.fields())
-            return loopback[final]
+            return loopback.compile(final)
 
         return decorator
 
diff --git a/tests/test_interface/test_interface.py b/tests/test_interface/test_interface.py
index 381cae1..5080897 100644
--- a/tests/test_interface/test_interface.py
+++ b/tests/test_interface/test_interface.py
@@ -139,7 +139,8 @@ def test_optional(block_maker):
     assert optional.first_optional(10) == 11
     assert optional.second_optional(10) == '10'
 
-    func = optional._container.loopback(lambda x: x, 'first_optional', 'first_optional').compile()['first_optional']
+    func = optional._container.loopback(
+        lambda x: x, 'first_optional', 'first_optional').compile().compile('first_optional')
     assert func(100500) == 100500