Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dmitry Trofimov
2014-11-18 14:25:40 +01:00
158 changed files with 1555 additions and 1234 deletions
+1 -1
View File
@@ -387,7 +387,7 @@ class BaseInterpreterInterface:
def getArray(self, attr, roffset, coffset, rows, cols, format):
xml = "<xml>"
name = ".".join(attr.split("\t"))
name = attr.split("\t")[-1]
array = pydevd_vars.evalInContext(name, self.getNamespace(), self.getNamespace())
if rows == -1 and cols == -1:
+3 -3
View File
@@ -974,15 +974,15 @@ class InternalGetArray(InternalThreadCommand):
self.thread_id = thread_id
self.frame_id = frame_id
self.scope = scope
self.name = ".".join(attrs.split("\t"))
self.name = attrs.split("\t")[-1]
self.attrs = attrs
self.roffset = int(roffset)
self.coffset = int(coffset)
self.rows = int(rows)
self.cols = int(cols)
self.format = format
if hasattr(self.format, 'decode'):
self.format = self.format.decode('utf-8')
if hasattr(self.format, 'encode'):
self.format = self.format.encode('utf-8')
def doIt(self, dbg):
try: