laneya

commit

39eca6b4579dbd97ffcb2f364ec86740e6762312

parent

8a77e649e671f43bd8929e6d716d5ee4112fcea1

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2018-08-03 09:17

port to py3

Diffstat

4 files changed, 7 insertions, 7 deletions

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

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

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

@@ -149,7 +149,7 @@ class Map(object):
  149   149         should call this method once per mainloop cycle.
  150   150 
  151   151         """
  152    -1         for sprite in self.sprites.itervalues():
   -1   152         for sprite in self.sprites.values():
  153   153             sprite.step()
  154   154 
  155   155     def is_collision_free(self, x, y):

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

@@ -67,8 +67,8 @@ import logging
   67    67 
   68    68 import trollius as asyncio
   69    69 
   70    -1 import deferred as q
   71    -1 import actions
   -1    70 from . import deferred as q
   -1    71 from . import actions
   72    72 
   73    73 logger = logging.getLogger('laneya')
   74    74 logger.addHandler(logging.StreamHandler())

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

@@ -1,7 +1,7 @@
    1     1 import trollius as asyncio
    2     2 
    3    -1 import protocol
    4    -1 from map import MapManager, User
   -1     3 from . import protocol
   -1     4 from .map import MapManager, User
    5     5 
    6     6 
    7     7 class Server(protocol.ServerProtocolFactory):
@@ -33,7 +33,7 @@ class Server(protocol.ServerProtocolFactory):
   33    33             _map.step()
   34    34 
   35    35     def get_active_maps(self):
   36    -1         return set([user.map for user in self.users.itervalues()])
   -1    36         return set([user.map for user in self.users.values()])
   37    37 
   38    38 
   39    39 def main():