Mercurial Repositories > eric / file comparison
comparison: Debugger/VariablesViewer.py
Debugger/VariablesViewer.py
- changeset 12
- 1d8dd9706f46
- parent 7
- c679fb30c8f3
- child 13
- 1af94a91f439
equal
deleted
inserted
replaced
| 11:b0996e4a289e | 12:1d8dd9706f46 |
|---|---|
| 14 from PyQt4.QtCore import * | 14 from PyQt4.QtCore import * |
| 15 from PyQt4.QtGui import * | 15 from PyQt4.QtGui import * |
| 16 | 16 |
| 17 from E4Gui.E4Application import e4App | 17 from E4Gui.E4Application import e4App |
| 18 | 18 |
| 19 from Config import ConfigVarTypeDispStrings, ConfigVarTypeStrings | 19 from .Config import ConfigVarTypeDispStrings, ConfigVarTypeStrings |
| 20 from VariableDetailDialog import VariableDetailDialog | 20 from .VariableDetailDialog import VariableDetailDialog |
| 21 from Utilities import toUnicode | 21 from Utilities import toUnicode |
| 22 | 22 |
| 23 import Preferences | 23 import Preferences |
| 24 | 24 |
| 25 | 25 |
| 399 self.resortEnabled = False | 399 self.resortEnabled = False |
| 400 for (var, vtype, value) in vlist: | 400 for (var, vtype, value) in vlist: |
| 401 self.__addItem(None, vtype, var, value) | 401 self.__addItem(None, vtype, var, value) |
| 402 | 402 |
| 403 # reexpand tree | 403 # reexpand tree |
| 404 openItems = self.openItems[:] | 404 openItems = sorted(self.openItems[:]) |
| 405 openItems.sort() | |
| 406 self.openItems = [] | 405 self.openItems = [] |
| 407 for itemPath in openItems: | 406 for itemPath in openItems: |
| 408 itm = self.__findItem(itemPath, 0) | 407 itm = self.__findItem(itemPath, 0) |
| 409 if itm is not None: | 408 if itm is not None: |
| 410 self.expandItem(itm) | 409 self.expandItem(itm) |
| 449 for var, vtype, value in vlist[1:]: | 448 for var, vtype, value in vlist[1:]: |
| 450 self.__addItem(itm, vtype, var, value) | 449 self.__addItem(itm, vtype, var, value) |
| 451 subelementsAdded = True | 450 subelementsAdded = True |
| 452 | 451 |
| 453 # reexpand tree | 452 # reexpand tree |
| 454 openItems = self.openItems[:] | 453 openItems = sorted(self.openItems[:]) |
| 455 openItems.sort() | |
| 456 self.openItems = [] | 454 self.openItems = [] |
| 457 for itemPath in openItems: | 455 for itemPath in openItems: |
| 458 itm = self.__findItem(itemPath, 0) | 456 itm = self.__findItem(itemPath, 0) |
| 459 if itm is not None and not itm.isExpanded(): | 457 if itm is not None and not itm.isExpanded(): |
| 460 if itm.populated: | 458 if itm.populated: |
| 522 Private method to convert a string to unicode. | 520 Private method to convert a string to unicode. |
| 523 | 521 |
| 524 @param s the string to be converted (string) | 522 @param s the string to be converted (string) |
| 525 @return unicode representation of s (unicode object) | 523 @return unicode representation of s (unicode object) |
| 526 """ | 524 """ |
| 527 if type(s) is type(u""): | 525 # TODO: remove me |
| 526 if isinstance(s, type("")): | |
| 528 return s | 527 return s |
| 529 try: | 528 try: |
| 530 u = unicode(s, self.loc) | 529 u = str(s, self.loc) |
| 531 except TypeError: | 530 except TypeError: |
| 532 u = str(s) | 531 u = str(s) |
| 533 except UnicodeError: | 532 except UnicodeError: |
| 534 u = toUnicode(s) | 533 u = toUnicode(s) |
| 535 return u | 534 return u |
