Skip to content

Commit c6d9217

Browse files
jef-njef-n
committedMar 15, 2016
python fixes:
* issues identified by pyflakes (star and unused imports) * pyqtwrapper: add QtSvg * some exceptions e.message => unicode(e) * some translations tr("..." % foo) => tr("...") % foo * TODO: python/console/console_sci.py:547 QsciScintillaCompat? python/plugins/db_manager/dlg_query_builder.py:304 pop_up_error?
·
ltr-3_40archive/master_2
1 parent cc5219b commit c6d9217

File tree

162 files changed

+269
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+269
-447
lines changed
 

‎python/PyQt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ SET(PYQT_COMPAT_FILES
1313
QtXml.py
1414
QtSql.py
1515
QtTest.py
16+
QtSvg.py
1617
Qsci.py
1718
uic/__init__.py
1819
uic/pyuic.py

‎python/PyQt/PyQt4/QtCore.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,8 @@
2424
__revision__ = '$Format:%H$'
2525

2626
import sip
27-
28-
try:
29-
apis = ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]
30-
for api in apis:
31-
sip.setapi(api, 2)
32-
except ValueError:
33-
# API has already been set so we can't set it again.
34-
pass
27+
for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]:
28+
sip.setapi(api, 2)
3529

3630
from PyQt4.QtCore import *
3731
from PyQt4.QtGui import QItemSelectionModel, QSortFilterProxyModel

0 commit comments

Comments
 (0)
Please sign in to comment.