Merge pull request #631 from vertexmc/py37_async

Rename synapse.async for python 3.7 compat
2lambda123 · Feb 8, 2018 · d010700 · d010700
2 parents beca675 + 8838e7a
commit d010700
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/synapse/lib/remcycle.py b/synapse/lib/remcycle.py
@@ -26,7 +26,7 @@
 import tornado.ioloop as t_ioloop
 import tornado.httpclient as t_http
 # Custom Code
-import synapse.async as s_async
+import synapse.synasync as s_async
 import synapse.common as s_common
 import synapse.cortex as s_cortex
 

diff --git a/synapse/lib/service.py b/synapse/lib/service.py
@@ -4,7 +4,7 @@
 logger = logging.getLogger(__name__)
 
 import synapse.glob as s_glob
-import synapse.async as s_async
+import synapse.synasync as s_async
 import synapse.common as s_common
 import synapse.eventbus as s_eventbus
 import synapse.telepath as s_telepath

diff --git a/synapse/lib/webapp.py b/synapse/lib/webapp.py
@@ -8,7 +8,7 @@
 import tornado.ioloop
 import tornado.httpserver
 
-import synapse.async as s_async
+import synapse.synasync as s_async
 import synapse.common as s_common
 import synapse.daemon as s_daemon
 import synapse.lib.config as s_config

diff --git a/synapse/async.py → synapse/synasync.py b/synapse/async.py → synapse/synasync.py
diff --git a/synapse/telepath.py b/synapse/telepath.py
@@ -9,7 +9,7 @@
 
 import synapse.glob as s_glob
 import synapse.link as s_link
-import synapse.async as s_async
+import synapse.synasync as s_async
 import synapse.common as s_common
 import synapse.dyndeps as s_dyndeps
 import synapse.eventbus as s_eventbus

diff --git a/synapse/tests/test_async.py b/synapse/tests/test_async.py
@@ -2,7 +2,7 @@
 import unittest
 import threading
 
-import synapse.async as s_async
+import synapse.synasync as s_async
 import synapse.lib.scope as s_scope
 import synapse.lib.threads as s_threads
 

diff --git a/synapse/tests/test_lib_service.py b/synapse/tests/test_lib_service.py
@@ -1,4 +1,4 @@
-import synapse.async as s_async
+import synapse.synasync as s_async
 import synapse.daemon as s_daemon
 import synapse.telepath as s_telepath
 

diff --git a/synapse/tests/test_telepath.py b/synapse/tests/test_telepath.py
@@ -2,7 +2,7 @@
 import collections
 
 import synapse.link as s_link
-import synapse.async as s_async
+import synapse.synasync as s_async
 import synapse.daemon as s_daemon
 import synapse.eventbus as s_eventbus
 import synapse.telepath as s_telepath