Merge branch 'package-reorg' of git://github.com/kmike/qtreactor into…

… kmike-package-reorg

bin/gtrial

@@ -22,6 +22,6 @@ if hasattr(os, "getuid") and os.getuid() != 0:
 sys.path[:] = map(os.path.abspath, sys.path)
 # end chdir armor
 
-from gtrial import run
+from qtreactor.gtrial import run
 
 run()

ghtTests/fakeAppButtonStress.py

@@ -7,9 +7,9 @@
 
 app = QtGui.QApplication(sys.argv)
 
-import qt4reactor
+from qtreactor import pyqt4reactor
 
-qt4reactor.install()
+pyqt4reactor.install()
 
 from twisted.internet import reactor, task
 

ghtTests/ircClient.py

@@ -1,11 +1,11 @@
 from __future__ import print_function
 
-import qt4reactor
+from qtreactor import pyqt4reactor
 
 from PyQt4 import QtGui
 
 app = QtGui.QApplication(sys.argv)
-qt4reactor.install()
+pyqt4reactor.install()
 
 from twisted.words.protocols import irc
 from twisted.internet import reactor, protocol

ghtTests/testIterate.py

@@ -7,9 +7,9 @@
 
 app = QtGui.QApplication(sys.argv)
 
-import qt4reactor
+from qtreactor import pyqt4reactor
 
-qt4reactor.install()
+pyqt4reactor.install()
 
 from twisted.internet import reactor, task
 from twisted.python import log

qtreactor/gtrial.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, absolute_import
 
 import sys
 
@@ -8,7 +8,7 @@
 
 app = QtGui.QApplication(sys.argv)
 
-import pyqt4reactor
+from qtreactor import pyqt4reactor
 
 pyqt4reactor.install()
 

qtreactor/pyqt4reactor.py

@@ -11,15 +11,15 @@
 
 """
 
-from __future__ import print_function
+from __future__ import print_function, absolute_import
 
 from twisted.python import runtime
 
-import qtreactor_config
+from qtreactor import qtreactor_config
 
 qtreactor_config.set_qt_name("PyQt4")
 
-import qt4base
+from qtreactor import qt4base
 
 class pyqt4reactor(qt4base.QtReactor):
     pass

qtreactor/pyside4reactor.py

@@ -11,15 +11,15 @@
 
 """
 
-from __future__ import print_function
+from __future__ import print_function, absolute_import
 
 from twisted.python import runtime
 
-import qtreactor_config
+from qtreactor import qtreactor_config
 
 qtreactor_config.set_qt_name("PySide")
 
-import qt4base
+from qtreactor import qt4base
 
 class pyqt4reactor(qt4base.QtReactor):
     pass

qtreactor/qt4base.py

@@ -11,15 +11,15 @@
 
 """
 
-from __future__ import print_function
+from __future__ import print_function, absolute_import
 import sys
 
 from zope.interface import implements
 from twisted.internet.interfaces import IReactorFDSet
 from twisted.python import log, runtime
 from twisted.internet import posixbase
 
-import qtreactor_config
+from qtreactor import qtreactor_config
 
 if qtreactor_config.get_qt_name() == "PyQt4":
     from PyQt4 import QtCore