summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asciifarm/client/display.py (renamed from asciifarm/client/newdisplay/display.py)2
-rw-r--r--asciifarm/client/layout.xml (renamed from asciifarm/client/newdisplay/layout.xml)0
-rw-r--r--asciifarm/client/main.py2
-rw-r--r--asciifarm/client/newdisplay/__init__.py0
4 files changed, 2 insertions, 2 deletions
diff --git a/asciifarm/client/newdisplay/display.py b/asciifarm/client/display.py
index 8a578fa..13e4f6a 100644
--- a/asciifarm/client/newdisplay/display.py
+++ b/asciifarm/client/display.py
@@ -7,7 +7,7 @@ from ratuil.bufferedscreen import BufferedScreen as Screen
#from ratuil.screen import Screen
from ratuil.textstyle import TextStyle
from asciifarm.common.utils import get
-from ..listselector import ListSelector
+from .listselector import ListSelector
SIDEWIDTH = 20
diff --git a/asciifarm/client/newdisplay/layout.xml b/asciifarm/client/layout.xml
index 78337dc..78337dc 100644
--- a/asciifarm/client/newdisplay/layout.xml
+++ b/asciifarm/client/layout.xml
diff --git a/asciifarm/client/main.py b/asciifarm/client/main.py
index 58db26f..d720477 100644
--- a/asciifarm/client/main.py
+++ b/asciifarm/client/main.py
@@ -10,7 +10,7 @@ import signal
from .connection import Connection
from .gameclient import Client
-from .newdisplay.display import Display
+from .display import Display
from .parseargs import parse_args
from ratuil.screen import Screen
diff --git a/asciifarm/client/newdisplay/__init__.py b/asciifarm/client/newdisplay/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/asciifarm/client/newdisplay/__init__.py
+++ /dev/null