projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The reload function is in the imp module
[mudpy.git]
/
lib
/
mudpy
/
misc.py
diff --git
a/lib/mudpy/misc.py
b/lib/mudpy/misc.py
index
1bef3f3
..
3193e11
100644
(file)
--- a/
lib/mudpy/misc.py
+++ b/
lib/mudpy/misc.py
@@
-142,7
+142,7
@@
class Element:
return default
def getint(self, facet, default=None):
return default
def getint(self, facet, default=None):
- """Return values as int
/long
type."""
+ """Return values as int type."""
if default is None:
default = 0
if self.origin.data.has_option(self.key, facet):
if default is None:
default = 0
if self.origin.data.has_option(self.key, facet):
@@
-192,18
+192,17
@@
class Element:
def set(self, facet, value):
"""Set values."""
if not self.has_facet(facet) or not self.get(facet) == value:
def set(self, facet, value):
"""Set values."""
if not self.has_facet(facet) or not self.get(facet) == value:
- if type(value) is long or repr(type(value)) == "<type 'unicode'>":
+ # TODO: remove this check after the switch to py3k
+ if repr(type(value)) == "<type 'unicode'>":
value = str(value)
value = str(value)
-
el
if not type(value) is str:
+ if not type(value) is str:
value = repr(value)
self.origin.data.set(self.key, facet, value)
self.origin.modified = True
def append(self, facet, value):
value = repr(value)
self.origin.data.set(self.key, facet, value)
self.origin.modified = True
def append(self, facet, value):
- """Append value tp a list."""
- if type(value) is long:
- value = str(value)
- elif not type(value) is str:
+ """Append value to a list."""
+ if not type(value) is str:
value = repr(value)
newlist = self.getlist(facet)
newlist.append(value)
value = repr(value)
newlist = self.getlist(facet)
newlist.append(value)
@@
-350,7
+349,7
@@
class Element:
description = element.get("description")
if description:
message += description + "$(eol)"
description = element.get("description")
if description:
message += description + "$(eol)"
- portal_list =
element.portals().keys(
)
+ portal_list =
list(element.portals().keys()
)
if portal_list:
portal_list.sort()
message += "$(cyn)[ Exits: " + ", ".join(
if portal_list:
portal_list.sort()
message += "$(cyn)[ Exits: " + ", ".join(
@@
-959,7
+958,8
@@
class User:
# log non-printable characters remaining
if mudpy.telnet.is_enabled(self, mudpy.telnet.TELOPT_BINARY,
mudpy.telnet.HIM):
# log non-printable characters remaining
if mudpy.telnet.is_enabled(self, mudpy.telnet.TELOPT_BINARY,
mudpy.telnet.HIM):
- asciiline = filter(lambda x: " " <= x <= "~", line)
+ asciiline = "".join(
+ filter(lambda x: " " <= x <= "~", line))
if line != asciiline:
logline = "Non-ASCII characters from "
if self.account and self.account.get("name"):
if line != asciiline:
logline = "Non-ASCII characters from "
if self.account and self.account.get("name"):
@@
-1652,7
+1652,7
@@
def get_menu_choices(user):
def get_formatted_menu_choices(state, choices):
"""Returns a formatted string of menu choices."""
choice_output = ""
def get_formatted_menu_choices(state, choices):
"""Returns a formatted string of menu choices."""
choice_output = ""
- choice_keys =
choices.keys(
)
+ choice_keys =
list(choices.keys()
)
choice_keys.sort()
for choice in choice_keys:
choice_output += " [$(red)" + choice + "$(nrm)] " + choices[
choice_keys.sort()
for choice in choice_keys:
choice_output += " [$(red)" + choice + "$(nrm)] " + choices[
@@
-1773,9
+1773,9
@@
def handler_entering_account_name(user):
name = input_data.lower()
# fail if there are non-alphanumeric characters
name = input_data.lower()
# fail if there are non-alphanumeric characters
- if name != filter(
- lambda x: x >= "0" and x <= "9" or x >= "a" and x <= "z", name
- ):
+ if name !=
"".join(
filter(
+ lambda x: x >= "0" and x <= "9" or x >= "a" and x <= "z",
+
name)
):
user.error = "bad_name"
# if that account exists, time to request a password
user.error = "bad_name"
# if that account exists, time to request a password
@@
-1839,11
+1839,11
@@
def handler_entering_new_password(user):
# make sure the password is strong--at least one upper, one lower and
# one digit, seven or more characters in length
if len(input_data) > 6 and len(
# make sure the password is strong--at least one upper, one lower and
# one digit, seven or more characters in length
if len(input_data) > 6 and len(
-
filter(lambda x: x >= "0" and x <= "9", input_data
)
+
list(filter(lambda x: x >= "0" and x <= "9", input_data)
)
) and len(
) and len(
-
filter(lambda x: x >= "A" and x <= "Z", input_data
)
+
list(filter(lambda x: x >= "A" and x <= "Z", input_data)
)
) and len(
) and len(
-
filter(lambda x: x >= "a" and x <= "z", input_data
)
+
list(filter(lambda x: x >= "a" and x <= "z", input_data)
)
):
# hash and store it, then move on to verification
):
# hash and store it, then move on to verification
@@
-2050,7
+2050,7
@@
def command_help(actor, parameters):
# give a sorted list of commands with descriptions if provided
output = "These are the commands available to you:$(eol)$(eol)"
# give a sorted list of commands with descriptions if provided
output = "These are the commands available to you:$(eol)$(eol)"
- sorted_commands =
universe.categories["command"].keys(
)
+ sorted_commands =
list(universe.categories["command"].keys()
)
sorted_commands.sort()
for item in sorted_commands:
command = universe.categories["command"][item]
sorted_commands.sort()
for item in sorted_commands:
command = universe.categories["command"][item]
@@
-2190,13
+2190,13
@@
def command_show(actor, parameters):
) + " increments elapsed since the world was created."
elif arguments[0] == "categories":
message = "These are the element categories:$(eol)"
) + " increments elapsed since the world was created."
elif arguments[0] == "categories":
message = "These are the element categories:$(eol)"
- categories =
universe.categories.keys(
)
+ categories =
list(universe.categories.keys()
)
categories.sort()
for category in categories:
message += "$(eol) $(grn)" + category + "$(nrm)"
elif arguments[0] == "files":
message = "These are the current files containing the universe:$(eol)"
categories.sort()
for category in categories:
message += "$(eol) $(grn)" + category + "$(nrm)"
elif arguments[0] == "files":
message = "These are the current files containing the universe:$(eol)"
- filenames =
universe.files.keys(
)
+ filenames =
list(universe.files.keys()
)
filenames.sort()
for filename in filenames:
if universe.files[filename].is_writeable():
filenames.sort()
for filename in filenames:
if universe.files[filename].is_writeable():