Cleaned up code

kalaspuff · Jul 2, 2017 · 58d2ab8 · 58d2ab8
1 parent acc5352
commit 58d2ab8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/tomodachi/transport/amqp.py b/tomodachi/transport/amqp.py
@@ -209,10 +209,7 @@ async def connect(cls: Any, obj: Any, context: Dict) -> Any:
 
         channel = await protocol.channel()
         if not cls.channel:
-            try:
-                stop_method = getattr(obj, '_stop_service')
-            except AttributeError as e:
-                stop_method = None
+            stop_method = getattr(obj, '_stop_service', None)
             async def stop_service(*args: Any, **kwargs: Any) -> None:
                 if stop_method:
                     await stop_method(*args, **kwargs)

diff --git a/tomodachi/transport/aws_sns_sqs.py b/tomodachi/transport/aws_sns_sqs.py
@@ -508,10 +508,7 @@ async def _callback() -> None:
 
         loop = asyncio.get_event_loop()  # type: Any
 
-        try:
-            stop_method = getattr(obj, '_stop_service')
-        except AttributeError as e:
-            stop_method = None
+        stop_method = getattr(obj, '_stop_service', None)
         async def stop_service(*args: Any, **kwargs: Any) -> None:
             if not cls.close_waiter.done():
                 cls.close_waiter.set_result(None)
@@ -563,10 +560,7 @@ async def stop_service(*args: Any, **kwargs: Any) -> None:
 
         setattr(obj, '_stop_service', stop_service)
 
-        try:
-            started_method = getattr(obj, '_started_service')
-        except AttributeError as e:
-            started_method = None
+        started_method = getattr(obj, '_started_service', None)
         async def started_service(*args: Any, **kwargs: Any) -> None:
             if started_method:
                 await started_method(*args, **kwargs)

diff --git a/tomodachi/transport/http.py b/tomodachi/transport/http.py
@@ -353,10 +353,7 @@ async def func() -> web.Response:
             port = int(server.sockets[0].getsockname()[1])
             context['_http_port'] = port
 
-            try:
-                stop_method = getattr(obj, '_stop_service')
-            except AttributeError as e:
-                stop_method = None
+            stop_method = getattr(obj, '_stop_service', None)
             async def stop_service(*args: Any, **kwargs: Any) -> None:
                 if stop_method:
                     await stop_method(*args, **kwargs)

diff --git a/tomodachi/transport/schedule.py b/tomodachi/transport/schedule.py
@@ -166,10 +166,7 @@ async def schedule_loop() -> None:
 
         loop = asyncio.get_event_loop()  # type: Any
 
-        try:
-            stop_method = getattr(obj, '_stop_service')
-        except AttributeError as e:
-            stop_method = None
+        stop_method = getattr(obj, '_stop_service', None)
         async def stop_service(*args: Any, **kwargs: Any) -> None:
             if not cls.close_waiter.done():
                 cls.close_waiter.set_result(None)
@@ -186,10 +183,7 @@ async def stop_service(*args: Any, **kwargs: Any) -> None:
 
         setattr(obj, '_stop_service', stop_service)
 
-        try:
-            started_method = getattr(obj, '_started_service')
-        except AttributeError as e:
-            started_method = None
+        started_method = getattr(obj, '_started_service', None)
         async def started_service(*args: Any, **kwargs: Any) -> None:
             if started_method:
                 await started_method(*args, **kwargs)