Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed 'with' statement; it's available in Python2.5, but one needs to use the future import to do that, so easiest to remove it. Resolves issue 230.

Browse source
This commit is contained in:
Griatch 2012-05-04 10:03:41 +02:00
parent 7058b9f210
commit c49fbd7d99
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
game/evennia.py
View file

@ -12,7 +12,7 @@ menu. Run the script with the -h flag to see usage information.
import os
import sys, signal
from optparse import OptionParser
from subprocess import Popen, call
from subprocess import Popen
# Set the Python path up so we can get to settings.py from here.
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
@ -22,6 +22,7 @@ if not os.path.exists('settings.py'):
# make sure we have a settings.py file.
print " No settings.py file found. launching manage.py ..."
# this triggers the settings file creation.
import game.manage
print """
@ -448,7 +449,6 @@ def main():
parser.add_option('-i', '--interactive', action='store_true', dest='interactive', default=False, help="Start given processes in interactive mode (log to stdout, don't start as a daemon).")
options, args = parser.parse_args()
inter = options.interactive
if not args:
mode = "menu"
@ -460,10 +460,10 @@ def main():
service = args[1]
if mode not in ['menu', 'start', 'reload', 'stop']:
print "mode should be none or one of 'menu', 'start', 'reload' or 'stop'."
print "mode should be none, 'menu', 'start', 'reload' or 'stop'."
sys.exit()
if service not in ['server', 'portal', 'all']:
print "service should be none or 'server', 'portal' or 'all'."
print "service should be none, 'server', 'portal' or 'all'."
sys.exit()
if mode == 'menu':

5
game/manage.py
View file

@ -15,8 +15,9 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
# Get Evennia version
#------------------------------------------------------------
try:
with open(os.pardir + os.sep + 'VERSION') as f:
VERSION = "%s-r%s" % (f.read().strip(), os.popen("hg id -i").read().strip())
f = open(os.pardir + os.sep + 'VERSION', 'r''')
VERSION = "%s-r%s" % (f.read().strip(), os.popen("hg id -i").read().strip())
f.close()
except IOError:
VERSION = "Unknown version"