laneya

commit

8f5e90943f4adf0656b8f7aae1bcd55cd0027d28

parent

e44b3e7c1807a1eb51c4d4b09315ed21dc65ff9d

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2018-08-03 12:12

centralize asyncio import

Diffstat

4 files changed, 3 insertions, 8 deletions

diff --git a/laneya/client.py b/laneya/client.py

@@ -1,8 +1,7 @@
    1    -1 import trollius as asyncio
    2    -1 
    3     1 from dirtywords import Screen
    4     2 
    5     3 from . import protocol
   -1     4 from .protocol import asyncio
    6     5 
    7     6 screen = Screen(40, 60)
    8     7 screen.border()

diff --git a/laneya/server.py b/laneya/server.py

@@ -1,9 +1,5 @@
    1    -1 try:
    2    -1     import asyncio
    3    -1 except ImportError:
    4    -1     import trollius as asyncio
    5    -1 
    6     1 from . import protocol
   -1     2 from .protocol import asyncio
    7     3 from .map import MapManager, User
    8     4 
    9     5 

diff --git a/setup.py b/setup.py

@@ -11,7 +11,6 @@ setup(
   11    11     author_email='tobias.bengfort@posteo.de',
   12    12     packages=['laneya'],
   13    13     install_requires=[
   14    -1         'trollius',
   15    14         'dirtywords',
   16    15     ],
   17    16     entry_points={'console_scripts': [

diff --git a/tox.ini b/tox.ini

@@ -21,3 +21,4 @@ deps =
   21    21     nose
   22    22     coverage
   23    23     mock
   -1    24     trollius