diff options
| -rw-r--r-- | asciifarmclient/__init__.py (renamed from asciifarm/charmaps/__init__.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/__main__.py (renamed from asciifarm/client/__main__.py) | 6 | ||||
| -rw-r--r-- | asciifarmclient/commandhandler.py (renamed from asciifarm/client/commandhandler.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/common/__init__.py (renamed from asciifarm/client/__init__.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/common/messages.py (renamed from asciifarm/common/messages.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/common/tcommunicate.py (renamed from asciifarm/common/tcommunicate.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/common/utils.py (renamed from asciifarm/common/utils.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/connection.py (renamed from asciifarm/client/connection.py) | 2 | ||||
| -rw-r--r-- | asciifarmclient/display.py (renamed from asciifarm/client/display.py) | 2 | ||||
| -rw-r--r-- | asciifarmclient/gameclient.py (renamed from asciifarm/client/gameclient.py) | 2 | ||||
| -rw-r--r-- | asciifarmclient/inputhandler.py (renamed from asciifarm/client/inputhandler.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/layout.xml (renamed from asciifarm/client/layout.xml) | 0 | ||||
| -rw-r--r-- | asciifarmclient/listselector.py (renamed from asciifarm/client/listselector.py) | 2 | ||||
| -rw-r--r-- | asciifarmclient/loaders.py (renamed from asciifarm/client/loaders.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/main.py (renamed from asciifarm/client/main.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/parseargs.py (renamed from asciifarm/client/parseargs.py) | 0 | ||||
| -rw-r--r-- | asciifarmclient/paths.py (renamed from asciifarm/client/paths.py) | 0 | ||||
| -rw-r--r-- | charmaps/__init__.py (renamed from asciifarm/common/__init__.py) | 0 | ||||
| -rw-r--r-- | charmaps/emoji.json (renamed from asciifarm/charmaps/emoji.json) | 0 | ||||
| -rw-r--r-- | charmaps/fullwidth.json (renamed from asciifarm/charmaps/fullwidth.json) | 0 | ||||
| -rw-r--r-- | charmaps/halfwidth.json (renamed from asciifarm/charmaps/halfwidth.json) | 0 | ||||
| -rw-r--r-- | keybindings/azerty.json (renamed from asciifarm/keybindings/azerty.json) | 0 | ||||
| -rw-r--r-- | keybindings/default.json (renamed from asciifarm/keybindings/default.json) | 0 |
23 files changed, 7 insertions, 7 deletions
diff --git a/asciifarm/charmaps/__init__.py b/asciifarmclient/__init__.py index e69de29..e69de29 100644 --- a/asciifarm/charmaps/__init__.py +++ b/asciifarmclient/__init__.py diff --git a/asciifarm/client/__main__.py b/asciifarmclient/__main__.py index 2841ae9..d086dfb 100644 --- a/asciifarm/client/__main__.py +++ b/asciifarmclient/__main__.py @@ -6,11 +6,11 @@ if sys.version_info[0] < 3: print("This game is written in python 3.\nRun 'python3 "+sys.argv[0]+"' or './"+sys.argv[0]+"'") sys.exit(-1) -if __package__ == "asciifarm.client": +if __package__ == "asciifarmclient": from . import main else: import os.path - sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..")) - from asciifarm.client import main + sys.path.append(os.path.join(os.path.dirname(__file__), "..")) + from asciifarmclient import main main.main() diff --git a/asciifarm/client/commandhandler.py b/asciifarmclient/commandhandler.py index ec5baa3..ec5baa3 100644 --- a/asciifarm/client/commandhandler.py +++ b/asciifarmclient/commandhandler.py diff --git a/asciifarm/client/__init__.py b/asciifarmclient/common/__init__.py index e69de29..e69de29 100644 --- a/asciifarm/client/__init__.py +++ b/asciifarmclient/common/__init__.py diff --git a/asciifarm/common/messages.py b/asciifarmclient/common/messages.py index d3aed9a..d3aed9a 100644 --- a/asciifarm/common/messages.py +++ b/asciifarmclient/common/messages.py diff --git a/asciifarm/common/tcommunicate.py b/asciifarmclient/common/tcommunicate.py index b1fc1b0..b1fc1b0 100644 --- a/asciifarm/common/tcommunicate.py +++ b/asciifarmclient/common/tcommunicate.py diff --git a/asciifarm/common/utils.py b/asciifarmclient/common/utils.py index 95ac32b..95ac32b 100644 --- a/asciifarm/common/utils.py +++ b/asciifarmclient/common/utils.py diff --git a/asciifarm/client/connection.py b/asciifarmclient/connection.py index 0a188c3..370ef8a 100644 --- a/asciifarm/client/connection.py +++ b/asciifarmclient/connection.py @@ -1,7 +1,7 @@ import socket -from asciifarm.common.tcommunicate import send, receive +from asciifarmclient.common.tcommunicate import send, receive class Connection: diff --git a/asciifarm/client/display.py b/asciifarmclient/display.py index edd5acb..ae23b05 100644 --- a/asciifarm/client/display.py +++ b/asciifarmclient/display.py @@ -6,7 +6,7 @@ from ratuil.layout import Layout from ratuil.bufferedscreen import BufferedScreen as Screen #from ratuil.screen import Screen from ratuil.textstyle import TextStyle -from asciifarm.common.utils import get +from asciifarmclient.common.utils import get from .listselector import ListSelector diff --git a/asciifarm/client/gameclient.py b/asciifarmclient/gameclient.py index c0f702c..d677636 100644 --- a/asciifarm/client/gameclient.py +++ b/asciifarmclient/gameclient.py @@ -13,7 +13,7 @@ from queue import Queue import ratuil.inputs from .inputhandler import InputHandler -from asciifarm.common import messages +from asciifarmclient.common import messages class Client: diff --git a/asciifarm/client/inputhandler.py b/asciifarmclient/inputhandler.py index 4281c01..4281c01 100644 --- a/asciifarm/client/inputhandler.py +++ b/asciifarmclient/inputhandler.py diff --git a/asciifarm/client/layout.xml b/asciifarmclient/layout.xml index d50ecba..d50ecba 100644 --- a/asciifarm/client/layout.xml +++ b/asciifarmclient/layout.xml diff --git a/asciifarm/client/listselector.py b/asciifarmclient/listselector.py index b88b967..65e6e8c 100644 --- a/asciifarm/client/listselector.py +++ b/asciifarmclient/listselector.py @@ -1,5 +1,5 @@ -from asciifarm.common import utils +from asciifarmclient.common import utils class ListSelector: diff --git a/asciifarm/client/loaders.py b/asciifarmclient/loaders.py index efdd1c0..efdd1c0 100644 --- a/asciifarm/client/loaders.py +++ b/asciifarmclient/loaders.py diff --git a/asciifarm/client/main.py b/asciifarmclient/main.py index d720477..d720477 100644 --- a/asciifarm/client/main.py +++ b/asciifarmclient/main.py diff --git a/asciifarm/client/parseargs.py b/asciifarmclient/parseargs.py index a8b393b..a8b393b 100644 --- a/asciifarm/client/parseargs.py +++ b/asciifarmclient/parseargs.py diff --git a/asciifarm/client/paths.py b/asciifarmclient/paths.py index 407d54c..407d54c 100644 --- a/asciifarm/client/paths.py +++ b/asciifarmclient/paths.py diff --git a/asciifarm/common/__init__.py b/charmaps/__init__.py index e69de29..e69de29 100644 --- a/asciifarm/common/__init__.py +++ b/charmaps/__init__.py diff --git a/asciifarm/charmaps/emoji.json b/charmaps/emoji.json index 3049816..3049816 100644 --- a/asciifarm/charmaps/emoji.json +++ b/charmaps/emoji.json diff --git a/asciifarm/charmaps/fullwidth.json b/charmaps/fullwidth.json index 6d912fe..6d912fe 100644 --- a/asciifarm/charmaps/fullwidth.json +++ b/charmaps/fullwidth.json diff --git a/asciifarm/charmaps/halfwidth.json b/charmaps/halfwidth.json index d3e16f8..d3e16f8 100644 --- a/asciifarm/charmaps/halfwidth.json +++ b/charmaps/halfwidth.json diff --git a/asciifarm/keybindings/azerty.json b/keybindings/azerty.json index 3d69d07..3d69d07 100644 --- a/asciifarm/keybindings/azerty.json +++ b/keybindings/azerty.json diff --git a/asciifarm/keybindings/default.json b/keybindings/default.json index faf1b40..faf1b40 100644 --- a/asciifarm/keybindings/default.json +++ b/keybindings/default.json |