Made a better check for cleaning module names, should resolve Issue 319.
This commit is contained in:
parent
52af816977
commit
20d6de5104
2 changed files with 4 additions and 3 deletions
|
|
@ -281,7 +281,8 @@ class CmdGet(MuxCommand):
|
|||
if caller == obj:
|
||||
caller.msg("You can't get yourself.")
|
||||
return
|
||||
if obj.location == caller:
|
||||
print obj, obj.location, caller, caller==obj.location
|
||||
if caller == obj.location:
|
||||
caller.msg("You already hold that.")
|
||||
return
|
||||
if not obj.access(caller, 'get'):
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ be of use when designing your own game.
|
|||
|
||||
"""
|
||||
|
||||
import os, sys, imp, types, math
|
||||
import os, sys, imp, types, math, re
|
||||
import textwrap, datetime, random
|
||||
from inspect import ismodule
|
||||
from collections import defaultdict
|
||||
|
|
@ -837,7 +837,7 @@ def mod_import(module):
|
|||
if not os.path.isabs(module):
|
||||
module = os.path.abspath(module)
|
||||
path, filename = module.rsplit(os.path.sep, 1)
|
||||
modname = filename.rstrip('.py')
|
||||
modname = re.sub(r"\.py$", "", filename)
|
||||
|
||||
try:
|
||||
result = imp.find_module(modname, [path])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue