Merge 41889f8 into 5b8f32e

hyperspy · Jul 10, 2016 · 94b2796 · 94b2796
2 parents 5b8f32e + 41889f8
commit 94b2796
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/hyperspy/__init__.py b/hyperspy/__init__.py
@@ -1,16 +1,4 @@
 # -*- coding: utf-8 -*-
-try:
-    import sip
-    sip.setapi('QVariant', 2)
-    sip.setapi('QDate', 2)
-    sip.setapi('QDateTime', 2)
-    sip.setapi('QTextStream', 2)
-    sip.setapi('QTime', 2)
-    sip.setapi('QUrl', 2)
-    del sip
-except ImportError:
-    pass
-
 from hyperspy import docstrings
 
 __doc__ = """
@@ -30,10 +18,6 @@
 
 """ % docstrings.START_HSPY
 
-import os
-
-os.environ['QT_API'] = "pyqt"
-
 
 from . import Release