projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preserve loglines on reload
[mudpy.git]
/
mudpy
/
misc.py
diff --git
a/mudpy/misc.py
b/mudpy/misc.py
index
2cd7992
..
ec331a4
100644
(file)
--- a/
mudpy/misc.py
+++ b/
mudpy/misc.py
@@
-1218,7
+1218,9
@@
def weighted_choice(data):
expanded.append(key)
# return one at random
expanded.append(key)
# return one at random
- return random.choice(expanded)
+ # Whitelist the random.randrange() call in bandit since it's not used for
+ # security/cryptographic purposes
+ return random.choice(expanded) # nosec
def random_name():
def random_name():
@@
-1265,7
+1267,9
@@
def random_name():
name = ""
# create a name of random length from the syllables
name = ""
# create a name of random length from the syllables
- for _syllable in range(random.randrange(2, 6)):
+ # Whitelist the random.randrange() call in bandit since it's not used for
+ # security/cryptographic purposes
+ for _syllable in range(random.randrange(2, 6)): # nosec
name += weighted_choice(syllables)
# strip any leading quotemark, capitalize and return the name
name += weighted_choice(syllables)
# strip any leading quotemark, capitalize and return the name
@@
-1432,9
+1436,12
@@
def reload_data():
"""Reload all relevant objects."""
universe.save()
old_userlist = universe.userlist[:]
"""Reload all relevant objects."""
universe.save()
old_userlist = universe.userlist[:]
+ old_loglines = universe.loglines[:]
for element in list(universe.contents.values()):
element.destroy()
universe.load()
for element in list(universe.contents.values()):
element.destroy()
universe.load()
+ new_loglines = universe.loglines[:]
+ universe.loglines = old_loglines + new_loglines
for user in old_userlist:
user.reload()
for user in old_userlist:
user.reload()
@@
-1680,13
+1687,6
@@
def get_choice_action(user):
def call_hook_function(fname, arglist):
"""Safely execute named function with supplied arguments, return result."""
def call_hook_function(fname, arglist):
"""Safely execute named function with supplied arguments, return result."""
- # strip any explicit leader or parameter
- # TODO(fungi) remove this once the menu functions transition is complete
- if fname.startswith("mudpy."):
- fname = fname[6:]
- if fname.endswith("(user)"):
- fname = fname[:-6]
-
# all functions relative to mudpy package
function = mudpy
# all functions relative to mudpy package
function = mudpy