jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 01:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better testing of named %c format specifiers

Browse Source
This commit is contained in:
rocky
2018-05-08 08:49:43 -04:00
parent 15533c5e38
commit e76f1f107f
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin-tools/setup-master.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
PYTHON_VERSION=3.6.4 PYTHON_VERSION=3.6.5
# FIXME put some of the below in a common routine # FIXME put some of the below in a common routine
function finish { function finish {

8
uncompyle6/semantics/fragments.py
View File

@@ -1620,12 +1620,14 @@ class FragmentsWalker(pysource.SourceWalker, object):
index = entry[arg] index = entry[arg]
if isinstance(index, tuple): if isinstance(index, tuple):
assert node[index[0]] == index[1], ( assert node[index[0]] == index[1], (
"at %s[%d], %s vs %s" % ( "at %s[%d], expected %s node; got %s" % (
node.kind, arg, node[index[0]].kind, index[1]) node.kind, arg, node[index[0]].kind, index[1])
) )
index = index[0] index = index[0]
if isinstance(index, int): assert isinstance(index, int), (
self.preorder(node[index]) "at %s[%d], %s should be int or tuple" % (
node.kind, arg, type(index)))
self.preorder(node[index])
finish = len(self.f.getvalue()) finish = len(self.f.getvalue())
self.set_pos_info(node, start, finish) self.set_pos_info(node, start, finish)

9
uncompyle6/semantics/pysource.py
View File

@@ -1744,12 +1744,15 @@ class SourceWalker(GenericASTTraversal, object):
index = entry[arg] index = entry[arg]
if isinstance(index, tuple): if isinstance(index, tuple):
assert node[index[0]] == index[1], ( assert node[index[0]] == index[1], (
"at %s[%d], %s vs %s" % ( "at %s[%d], expected %s node; got %s" % (
node.kind, arg, node[index[0]].kind, index[1]) node.kind, arg, node[index[0]].kind, index[1])
) )
index = index[0] index = index[0]
if isinstance(index, int): assert isinstance(index, int), (
self.preorder(node[index]) "at %s[%d], %s should be int or tuple" % (
node.kind, arg, type(index)))
self.preorder(node[index])
arg += 1 arg += 1
elif typ == 'p': elif typ == 'p':
p = self.prec p = self.prec