mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-03-09 10:49:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Commit patch by cfsworks to clean up use of exec() and eval()

Browse Source
This commit is contained in:
rdb
2014-04-16 13:09:12 +00:00
parent 5abc6aa2fc
commit 51dffd0f5a
9 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/distributed/MsgTypes.py
View File

@@ -107,9 +107,7 @@ MsgName2Id = {
MsgId2Names = invertDictLossless(MsgName2Id)
# put msg names in module scope, assigned to msg value
for name, value in MsgName2Id.items():
exec('%s = %s' % (name, value))
del name, value
globals().update(MsgName2Id)
# These messages are ignored when the client is headed to the quiet zone
QUIET_ZONE_IGNORED_LIST = [

4
direct/src/distributed/MsgTypesCMU.py
View File

@@ -26,6 +26,4 @@ MsgName2Id = {
MsgId2Names = invertDictLossless(MsgName2Id)
# put msg names in module scope, assigned to msg value
for name, value in MsgName2Id.items():
exec('%s = %s' % (name, value))
del name, value
globals().update(MsgName2Id)

5
direct/src/gui/OnscreenGeom.py
View File

@@ -113,8 +113,7 @@ class OnscreenGeom(DirectObject, NodePath):
for option, value in kw.items():
# Use option string to access setter function
try:
setter = eval('self.set' +
string.upper(option[0]) + option[1:])
setter = getattr(self, 'set' + option[0].upper() + option[1:])
if (((setter == self.setPos) or
(setter == self.setHpr) or
(setter == self.setScale)) and
@@ -133,7 +132,7 @@ class OnscreenGeom(DirectObject, NodePath):
def cget(self, option):
# Get current configuration setting.
# This is for compatibility with DirectGui functions
getter = eval('self.get' + string.upper(option[0]) + option[1:])
getter = getattr(self, 'get' + option[0].upper() + option[1:])
return getter()
# Allow index style refererences

5
direct/src/gui/OnscreenImage.py
View File

@@ -130,8 +130,7 @@ class OnscreenImage(DirectObject, NodePath):
for option, value in kw.items():
# Use option string to access setter function
try:
setter = eval('self.set' +
string.upper(option[0]) + option[1:])
setter = getattr(self, 'set' + option[0].upper() + option[1:])
if (((setter == self.setPos) or
(setter == self.setHpr) or
(setter == self.setScale)) and
@@ -150,7 +149,7 @@ class OnscreenImage(DirectObject, NodePath):
def cget(self, option):
# Get current configuration setting.
# This is for compatibility with DirectGui functions
getter = eval('self.get' + string.upper(option[0]) + option[1:])
getter = getattr(self, 'get' + option[0].upper() + option[1:])
return getter()
# Allow index style refererences

5
direct/src/gui/OnscreenText.py
View File

@@ -381,8 +381,7 @@ class OnscreenText(DirectObject, NodePath):
for option, value in kw.items():
# Use option string to access setter function
try:
setter = eval('self.set' +
string.upper(option[0]) + option[1:])
setter = getattr(self, 'set' + option[0].upper() + option[1:])
if setter == self.setPos:
setter(value[0], value[1])
else:
@@ -397,7 +396,7 @@ class OnscreenText(DirectObject, NodePath):
def cget(self, option):
# Get current configuration setting.
# This is for compatibility with DirectGui functions
getter = eval('self.get' + string.upper(option[0]) + option[1:])
getter = getattr(self, 'get' + option[0].upper() + option[1:])
return getter()
def setAlign(self, align):

12
direct/src/leveleditor/ObjectMgrBase.py
View File

@@ -189,9 +189,9 @@ class ObjectMgrBase:
if funcName.startswith('.'):
# when it's using default objectHandler
if self.editor:
func = Functor(eval("self.editor.objectHandler%s"%funcName))
func = Functor(getattr(self.editor, "objectHandler%s"%funcName))
else: # when loaded outside of LE
func = Functor(eval("base.objectHandler%s"%funcName))
func = Functor(getattr(base, "objectHandler%s"%funcName))
else:
# when it's not using default objectHandler, whole name of the handling obj
# should be included in function name
@@ -686,11 +686,11 @@ class ObjectMgrBase:
if type(funcName) == types.StringType:
if funcName.startswith('.'):
if self.editor:
func = Functor(eval("self.editor.objectHandler%s"%funcName), **kwargs)
undoFunc = Functor(eval("self.editor.objectHandler%s"%funcName), **undoKwargs)
func = Functor(getattr(self.editor, "objectHandler%s"%funcName), **kwargs)
undoFunc = Functor(getattr(self.editor, "objectHandler%s"%funcName), **undoKwargs)
else: # when loaded outside of LE
func = Functor(eval("base.objectHandler%s"%funcName), **kwargs)
undoFunc = Functor(eval("base.objectHandler%s"%funcName), **undoKwargs)
func = Functor(getattr(base, "objectHandler%s"%funcName), **kwargs)
undoFunc = Functor(getattr(base, ".objectHandler%s"%funcName), **undoKwargs)
else:
func = Functor(eval(funcName), **kwargs)
undoFunc = Functor(eval(funcName), **undoKwargs)

4
direct/src/particles/Particles.py
View File

@@ -354,7 +354,7 @@ class Particles(ParticleSystem):
else:
file.write(targ+'.renderer.setColorBlendMode(ColorBlendAttrib.%s)\n' % cbmLut[cbMode])
cim = self.renderer.getColorInterpolationManager()
segIdList = eval('['+cim.getSegmentIdList().replace(' ',', ')+']')
segIdList = [int(seg) for seg in cim.getSegmentIdList().split()]
for sid in segIdList:
seg = cim.getSegment(sid)
if seg.isEnabled():
@@ -457,7 +457,7 @@ class Particles(ParticleSystem):
else:
file.write(targ+'.renderer.setColorBlendMode(ColorBlendAttrib.%s)\n' % cbmLut[cbMode])
cim = self.renderer.getColorInterpolationManager()
segIdList = eval('['+cim.getSegmentIdList().replace(' ',', ')+']')
segIdList = [int(seg) for seg in cim.getSegmentIdList().split()]
for sid in segIdList:
seg = cim.getSegment(sid)
if seg.isEnabled():

5
direct/src/showbase/ElementTree.py
View File

@@ -749,10 +749,7 @@ def _encode(s, encoding):
except AttributeError:
return s # 1.5.2: assume the string uses the right encoding
if sys.version[:3] == "1.5":
_escape = re.compile(r"[&<>\"\x80-\xff]+") # 1.5.2
else:
_escape = re.compile(eval(r'u"[&<>\"\u0080-\uffff]+"'))
_escape = re.compile(u"[&<>\"\u0080-\uffff]+")
_escape_map = {
"&": "&amp;",

2
direct/src/showbase/PythonUtil.py
View File

@@ -4188,7 +4188,7 @@ def unescapeHtmlString(s):
char = ' '
elif char == '%':
if i < (len(s)-2):
num = eval('0x' + s[i+1:i+3])
num = int(s[i+1:i+3], 16)
char = chr(num)
i += 2
i += 1