summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Rohdewald <wolfgang@rohdewald.de>2016-08-26 18:53:05 (GMT)
committerWolfgang Rohdewald <wolfgang@rohdewald.de>2016-08-26 20:38:00 (GMT)
commitf03d3004a5cd2e2b9dd0b1bf264f042a15a4d426 (patch)
treea1e67d3d1ca581ce3cd85defbf260fd6fb7e4034
parentc5acebd9a3cdf11fb4e84ce73e7b040e8721be19 (diff)
get rid of kajonggserver3.py again
-rw-r--r--CMakeLists.txt1
-rwxr-xr-xsrc/kajonggserver3.py28
-rwxr-xr-xsrc/kajonggtest.py4
-rw-r--r--src/login.py2
4 files changed, 2 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7025199..bdbe5b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,6 @@ IF(INSTALL_KAJONGG)
install(FILES src/kajonggui.rc DESTINATION ${DATA_INSTALL_DIR}/kajongg)
PYKDE4_ADD_EXECUTABLE(kajongg.py kajongg)
PYKDE4_ADD_EXECUTABLE(kajonggserver.py kajonggserver)
- PYKDE4_ADD_EXECUTABLE(kajonggserver3.py kajonggserver3)
kde4_install_icons(${ICON_INSTALL_DIR})
install(PROGRAMS kajongg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES kajongg.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
diff --git a/src/kajonggserver3.py b/src/kajonggserver3.py
deleted file mode 100755
index 63f08e9..0000000
--- a/src/kajonggserver3.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-Copyright (C) 2009-2014 Wolfgang Rohdewald <wolfgang@rohdewald.de>
-
-Kajongg is free software you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-"""
-
-from server import kajonggServer
-from util import checkMemory
-
-kajonggServer()
-checkMemory()
-# profileMe()
diff --git a/src/kajonggtest.py b/src/kajonggtest.py
index 33411b9..7419927 100755
--- a/src/kajonggtest.py
+++ b/src/kajonggtest.py
@@ -178,7 +178,7 @@ class Server(StrMixin):
print('starting server for %s commit=%s in %s' % (' ' * 16, job.commitId, self.clone.tmpdir))
cmd = [os.path.join(
job.srcDir(),
- 'kajonggserver3.py' if isPython3 else 'kajonggserver.py')]
+ 'kajonggserver.py')]
cmd.insert(0, 'python{}'.format(self.pythonVersion))
if OPTIONS.usePort:
self.portNumber = random.randrange(1025, 65000)
@@ -756,7 +756,7 @@ def main():
"""parse options, play, evaluate results"""
global OPTIONS # pylint: disable=global-statement
- # we want only english in the logs because i18n and friends
+ # we want only english in the logs because i18n and friends
# behave differently in kde and kdestub
os.environ['LANG'] = 'en_US.UTF-8'
(OPTIONS, args) = parse_options()
diff --git a/src/login.py b/src/login.py
index 15a558d..f8c2663 100644
--- a/src/login.py
+++ b/src/login.py
@@ -186,8 +186,6 @@ class Url(unicode):
result = [tryServer]
else:
result = ['kajonggserver']
- if isPython3:
- result[-1] = result[-1].replace('server', 'server3')
if Debug.connections:
logDebug(m18n('trying to start local server %1', result))
return result