Removed support for pyside

CHANGELOG

@@ -4,6 +4,7 @@
 - Improved select_union_intersect_subtract optimization to avoid parenthesis whenever possible
 - Moved feedback service, and added the code for it
 - Different way of checking the latest version
+- Removed support for pyside
 
 1.1
 - Incorrect relational operations now raise an exception instead of returning None

debian/changelog

@@ -2,6 +2,7 @@ relational (1.2-1) unstable; urgency=medium
 
   * New upstream release
   * Point to new upstream location
+  * Can only use PyQt
 
  -- Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>  Fri, 27 Dec 2013 00:35:44 +0100
 

debian/control

@@ -19,7 +19,7 @@ Description: Educational tool for relational algebra (standalone module)
 
 Package: relational
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-relational (>= ${binary:Version}), python-qt4 | python-pyside.qtgui, python-qt4 | python-pyside.qtcore, python-qt4 | python-pyside.qtwebkit
+Depends: ${misc:Depends}, ${python:Depends}, python-relational (>= ${binary:Version}), python-qt4
 Description: Educational tool for relational algebra (graphical user interface)
  Relational is primarily a tool to provide a workspace for experimenting with
  relational algebra, an offshoot of first-order logic.

relational_gui.py

@@ -83,28 +83,13 @@ if __name__ == "__main__":
 
     if x11:
 
-        pyqt = True
+        import sip  # needed on windows
-
+        from PyQt4 import QtGuiq
         try:
-            import sip  # needed on windows
+            from relational_gui import maingui, guihandler, about, surveyForm
-            from PyQt4 import QtGui
         except:
-            print >> sys.stderr, "PyQt seems to be missing, trying to use Pyside"
+            print >> sys.stderr, "Module relational_gui is missing.\nPlease install relational package."
-            from PySide import QtCore, QtGui
+            sys.exit(3)
-            pyqt = False
-
-        if pyqt:
-            try:
-                from relational_gui import maingui, guihandler, about, surveyForm
-            except:
-                print >> sys.stderr, "Module relational_gui is missing.\nPlease install relational package."
-                sys.exit(3)
-        else:
-            try:
-                from relational_pyside import maingui, guihandler, about, surveyForm
-            except:
-                print >> sys.stderr, "Module relational_pyside is missing.\nPlease install relational package."
-                sys.exit(3)
 
         about.version = version
         surveyForm.version = version

setup/relational.setup.py

@@ -1,23 +1,23 @@
 # -*- coding: utf-8 -*-
 # Relational
 # Copyright (C) 2008  Salvo "LtWorf" Tomaselli
-# 
+#
 # Relational is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
+#
 # author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
 
 import installer_common
 
 installer_common.c_setup('relational_gui')
-installer_common.c_setup('relational_pyside')
+#installer_common.c_setup('relational_pyside')