FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some Python 3 fixes

Browse source 
Some missing parentheses and one itertools.imap (Py2) vs map (Py3) issue.

gdb/ChangeLog:

	* python/lib/gdb/command/unwinders.py: Add parentheses.

gdb/testsuite/ChangeLog:

	* gdb.python/py-framefilter.py (ErrorFilter.filter): Use map function
	if itertools.imap is not present.
	* gdb.python/py-objfile.exp: Add parentheses.
	* gdb.python/py-type.exp: Same.
	* gdb.python/py-unwind-maint.py: Same.
This commit is contained in:
Simon Marchi 2015-04-15 11:54:33 -04:00
parent 6bbbba9ba5
commit 40d2f8d62e
7 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gdb/ChangeLog
View file

@ -1,3 +1,7 @@
2015-04-15 Simon Marchi <simon.marchi@ericsson.com>
* python/lib/gdb/command/unwinders.py: Add parentheses.
2015-04-15 Yao Qi <yao.qi@linaro.org> 2015-04-15 Yao Qi <yao.qi@linaro.org>
* arm-linux-tdep.c (arm_linux_copy_svc): Update debug message. * arm-linux-tdep.c (arm_linux_copy_svc): Update debug message.

2
gdb/python/lib/gdb/command/unwinders.py
View file

@ -83,7 +83,7 @@ class InfoUnwinder(gdb.Command):
""" """
if not unwinders: if not unwinders:
return return
print title print(title)
for unwinder in unwinders: for unwinder in unwinders:
if name_re.match(unwinder.name): if name_re.match(unwinder.name):
print(" %s%s" % (unwinder.name, print(" %s%s" % (unwinder.name,

8
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,11 @@
2015-04-15 Simon Marchi <simon.marchi@ericsson.com>
* gdb.python/py-framefilter.py (ErrorFilter.filter): Use map function
if itertools.imap is not present.
* gdb.python/py-objfile.exp: Add parentheses.
* gdb.python/py-type.exp: Same.
* gdb.python/py-unwind-maint.py: Same.
2015-04-15 Yao Qi <yao.qi@linaro.org> 2015-04-15 Yao Qi <yao.qi@linaro.org>
* gdb.dwarf2/dynarr-ptr.exp (assemble): Use $ptr_size instead * gdb.dwarf2/dynarr-ptr.exp (assemble): Use $ptr_size instead

7
gdb/testsuite/gdb.python/py-framefilter.py
View file

@ -145,7 +145,12 @@ class ErrorFilter():
gdb.frame_filters [self.name] = self gdb.frame_filters [self.name] = self
def filter(self, frame_iter): def filter(self, frame_iter):
return itertools.imap(ErrorInName, frame_iter) # Python 3.x moved the itertools.imap functionality to map(),
# so check if it is available.
if hasattr(itertools, "imap"):
return itertools.imap (ErrorInName, frame_iter)
else:
return map(ErrorInName, frame_iter)
FrameFilter() FrameFilter()
FrameElider() FrameElider()

4
gdb/testsuite/gdb.python/py-objfile.exp
View file

@ -88,9 +88,9 @@ if { [gdb_unload] < 0 } {
return -1 return -1
} }
gdb_test "python print objfile.filename" "None" \ gdb_test "python print(objfile.filename)" "None" \
"objfile.filename after objfile is unloaded" "objfile.filename after objfile is unloaded"
gdb_test "python print objfile.username" "None" \ gdb_test "python print(objfile.username)" "None" \
"objfile.username after objfile is unloaded" "objfile.username after objfile is unloaded"
# Now build another copy of the testcase, this time without debug info. # Now build another copy of the testcase, this time without debug info.

4
gdb/testsuite/gdb.python/py-type.exp
View file

@ -247,10 +247,10 @@ restart_gdb "${binfile}"
# Skip all tests if Python scripting is not enabled. # Skip all tests if Python scripting is not enabled.
if { [skip_python_tests] } { continue } if { [skip_python_tests] } { continue }
gdb_test "python print gdb.lookup_type('char').array(1, 0)" \ gdb_test "python print(gdb.lookup_type('char').array(1, 0))" \
"char \\\[0\\\]" "char \\\[0\\\]"
gdb_test "python print gdb.lookup_type('char').array(1, -1)" \ gdb_test "python print(gdb.lookup_type('char').array(1, -1))" \
"Array length must not be negative.*" "Array length must not be negative.*"
with_test_prefix "lang_c" { with_test_prefix "lang_c" {

8
gdb/testsuite/gdb.python/py-unwind-maint.py
View file

@ -24,7 +24,7 @@ class TestGlobalUnwinder(Unwinder):
super(TestGlobalUnwinder, self).__init__("global_unwinder") super(TestGlobalUnwinder, self).__init__("global_unwinder")
def __call__(self, unwinder_info): def __call__(self, unwinder_info):
print "%s called" % self.name print("%s called" % self.name)
return None return None
class TestProgspaceUnwinder(Unwinder): class TestProgspaceUnwinder(Unwinder):
@ -32,7 +32,7 @@ class TestProgspaceUnwinder(Unwinder):
super(TestProgspaceUnwinder, self).__init__("%s_ps_unwinder" % name) super(TestProgspaceUnwinder, self).__init__("%s_ps_unwinder" % name)
def __call__(self, unwinder_info): def __call__(self, unwinder_info):
print "%s called" % self.name print("%s called" % self.name)
return None return None
class TestObjfileUnwinder(Unwinder): class TestObjfileUnwinder(Unwinder):
@ -40,7 +40,7 @@ class TestObjfileUnwinder(Unwinder):
super(TestObjfileUnwinder, self).__init__("%s_obj_unwinder" % name) super(TestObjfileUnwinder, self).__init__("%s_obj_unwinder" % name)
def __call__(self, unwinder_info): def __call__(self, unwinder_info):
print "%s called" % self.name print("%s called" % self.name)
return None return None
@ -56,4 +56,4 @@ if not saw_runtime_error:
gdb.unwinder.register_unwinder(None, TestGlobalUnwinder(), replace=True) gdb.unwinder.register_unwinder(None, TestGlobalUnwinder(), replace=True)
gdb.unwinder.register_unwinder(gdb.current_progspace(), gdb.unwinder.register_unwinder(gdb.current_progspace(),
TestProgspaceUnwinder("py_unwind_maint")) TestProgspaceUnwinder("py_unwind_maint"))
print "Python script imported" print("Python script imported")