Commit 01cb6afd authored by Dmitry Shachnev's avatar Dmitry Shachnev
Browse files
parent 1fd65cbd
......@@ -31,11 +31,14 @@ import socket
from qt import QStandardPaths
try:
from sip import unwrapinstance
from PyQt5.sip import unwrapinstance
except ImportError:
def unwrapinstance(dummy):
"""if there is no sip, we have no Qt objects anyway"""
pass
try:
from sip import unwrapinstance
except ImportError:
def unwrapinstance(dummy):
"""if there is no sip, we have no Qt objects anyway"""
pass
# pylint: disable=invalid-name
......
......@@ -38,7 +38,10 @@ from collections import defaultdict
from argparse import ArgumentParser
import sip
try:
from PyQt5 import sip
except ImportError:
import sip
# pylint: disable=wrong-import-order
......
......@@ -26,7 +26,10 @@ There are several variations of python ports for this script floating
around, it seemed easier to me to maintain one for myself
"""
import sip
try:
from PyQt5 import sip
except ImportError:
import sip
from qt import QObject, Qt, QAbstractItemModel, QModelIndex
from qt import QPersistentModelIndex, QFont, QColor, QSize
from common import isAlive
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment