diff --git a/aqt/importing.py b/aqt/importing.py index 0562da544..55584e965 100644 --- a/aqt/importing.py +++ b/aqt/importing.py @@ -112,15 +112,15 @@ you can enter it here. Use \\t to represent tab."""), else: d = self.importer.dialect.delimiter if d == "\t": - d = "Tab" + d = _("Tab") elif d == ",": - d = "Comma" + d = _("Comma") elif d == " ": - d = "Space" + d = _("Space") elif d == ";": - d = "Semicolon" + d = _("Semicolon") elif d == ":": - d = "Colon" + d = _("Colon") else: d = `d` if self.importer.delimiter: diff --git a/aqt/qt.py b/aqt/qt.py index 9d99ced86..009e5ebea 100644 --- a/aqt/qt.py +++ b/aqt/qt.py @@ -3,7 +3,7 @@ # imports are all in this file to make moving to pyside easier in the future -import sip +import sip, os sip.setapi('QString', 2) sip.setapi('QVariant', 2) sip.setapi('QUrl', 2) @@ -17,3 +17,13 @@ def debug(): from pdb import set_trace pyqtRemoveInputHook() set_trace() + +if os.environ.get("DEBUG"): + import sys, traceback + traceback.print_exc() + def info(type, value, tb): + from PyQt4.QtCore import pyqtRemoveInputHook + pyqtRemoveInputHook() + from pdb import pm + pm() + sys.excepthook = info