Merge lp:~mvo/gdebi/py3compat into lp:gdebi

[Michael Vogt]

I started looking into a py3 port (or py3 compatiblity) and started some small porting and also started adding automatic tests to ensure I don't break stuff while porting. Low risk at this point for trunk I think and probably
a useful way to get more tests and better compatibility over time.

[lp:~mvo/gdebi/py3compat]

443. By Michael Vogt on 2012-10-12

use relative imports (supported since python2.5)

444. By Michael Vogt on 2012-10-12

pyflake fixes and add test that runs automatically to ensure we stay pyflakes clean :)

445. By Michael Vogt on 2012-10-12

gdebi-gtk: remove accidental commit

=== modified file 'GDebi/DebPackage.py'
--- GDebi/DebPackage.py	2011-06-12 13:54:38 +0000
+++ GDebi/DebPackage.py	2012-10-12 16:06:23 +0000
@@ -24,7 +24,6 @@
 import apt.debfile
 from gettext import gettext as _
 
-from apt.debfile import DscSrcPackage
 
 class DebPackage(apt.debfile.DebPackage):
 
@@ -33,8 +32,13 @@
         self.downloaded = downloaded
 
     def __getitem__(self,item):
-        if not self._sections.has_key(item):
+        if not item in self._sections:
             # Translators: it's for missing entries in the deb package,
             # e.g. a missing "Maintainer" field
             return _("%s is not available") % item
         return self._sections[item]
+
+
+# just for compatibility
+class DscSrcPackage(apt.debfile.DscSrcPackage):
+    pass
 
=== modified file 'GDebi/GDebiCli.py'
--- GDebi/GDebiCli.py	2012-10-11 20:09:58 +0000
+++ GDebi/GDebiCli.py	2012-10-12 16:06:23 +0000
@@ -23,20 +23,18 @@
 
 import apt
 import apt_pkg
-import fcntl
+import logging
 import os
-import string
 import sys
-import time
-import thread
 
 from gettext import gettext as _
 from re import findall
+from subprocess import PIPE, Popen, call
 
 from apt.cache import Cache
-from DebPackage import DebPackage, DscSrcPackage
-
-from subprocess import PIPE, Popen, call
+
+from .DebPackage import DebPackage, DscSrcPackage
+
 
 class GDebiCli(object):
 
@@ -77,7 +75,8 @@
             else:
                 sys.stderr.write(_("Unknown package type '%s', exiting\n") % file)
                 sys.exit(1)
-        except (IOError,SystemError,ValueError),e:
+        except (IOError,SystemError,ValueError) as e:
+            logging.debug("error opening: %s" % e)
             sys.stderr.write(_("Failed to open the software package\n"))
             sys.stderr.write(_("The package might be corrupted or you are not "
                            "allowed to open the file. Check the permissions "
@@ -97,22 +96,27 @@
             print _("No description is available")
 
     def show_dependencies(self):
+        print self.get_dependencies_info()
+
+    def get_dependencies_info(self):
+        s = ""
         # show what changes
         (install, remove, unauthenticated) = self._deb.required_changes
         if len(unauthenticated) > 0:
-            print _("The following packages are UNAUTHENTICATED: ")
+            s += _("The following packages are UNAUTHENTICATED: ")
             for pkgname in unauthenticated:
-                print pkgname + " ",
+                s += pkgname + " "
         if len(remove) > 0:
-            print _("Requires the REMOVAL of the following packages: ")
+            s += _("Requires the REMOVAL of the following packages: ")
             for pkgname in remove:
-                print pkgname + " ",
-        print
+                s += pkgname + " "
+            s += "\n"
         if len(install) > 0:
-            print _("Requires the installation of the following packages: ") 
+            s += _("Requires the installation of the following packages: ") 
             for pkgname in install:
-                print pkgname + " ",
-        print
+                s += pkgname + " "
+            s += "\n"
+        return s
 
     def install(self):
         # install the dependecnies
@@ -122,7 +126,8 @@
             iprogress = apt.progress.base.InstallProgress()
             try:
                 res = self._cache.commit(fprogress,iprogress)
-            except(apt.cache.FetchFailedException, SystemError) e:
+                logging.debug("commit() returned %s" % res)
+            except(apt.cache.FetchFailedException, SystemError) as e:
                 sys.stderr.write(_("Error during install: '%s'") % e)
                 return 1
 
 
=== modified file 'GDebi/GDebiCommon.py'
--- GDebi/GDebiCommon.py	2012-09-12 21:28:17 +0000
+++ GDebi/GDebiCommon.py	2012-10-12 16:06:23 +0000
@@ -21,24 +21,21 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-
-import sys
+import gettext
+import logging
 import os
-import string
-import warnings
-warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
 from mimetypes import guess_type
 
-import apt
 import apt_pkg
-
 from apt.cache import Cache
-from DebPackage import DebPackage
-import gettext
+
+from .DebPackage import DebPackage
+
 
 def _(str):
     return utf8(gettext.gettext(str))
 
+
 def utf8(str):
     if isinstance(str, unicode):
         return str
@@ -47,6 +44,7 @@
     except:
         # assume latin1 as fallback
         return unicode(str, 'latin1')
+
 	  
 class GDebiCommon(object):
     # cprogress may be different in child classes
@@ -56,7 +54,7 @@
         self.version_info_title = ""
         self.version_info_msg = ""
         self._deb = None
-     	self._options = options
+        self._options = options
         self.install = []
         self.remove = []
         self.unauthenticated = 0
@@ -71,14 +69,15 @@
                              "To fix it run 'gksudo synaptic' or "
                              "'sudo apt-get install -f' "
                              "in a terminal window.")
-		return False
+                return False
         return True
 
     def open(self, file, downloaded=False):
         file = os.path.abspath(file)
         try:
             self._deb = DebPackage(file, self._cache, downloaded)
-        except (IOError,SystemError,ValueError),e:
+        except (IOError, SystemError, ValueError) as e:
+            logging.debug("open failed with %s" % e)
             mimetype=guess_type(file)
             if (mimetype[0] != None and 
                 mimetype[0] != "application/x-debian-package"):
 
=== renamed file 'GDebi/GDebi.py' => 'GDebi/GDebiGtk.py'
--- GDebi/GDebi.py	2012-10-11 20:09:07 +0000
+++ GDebi/GDebiGtk.py	2012-10-12 16:06:23 +0000
@@ -31,7 +31,7 @@
 import sys
 import time
 import tempfile
-import thread
+import threading
 import urllib
 
 import gi
@@ -45,12 +45,13 @@
 from gi.repository import Vte
 from gi.repository import Gio
 
-from DebPackage import DebPackage
-from SimpleGtkbuilderApp import SimpleGtkbuilderApp
 from apt.progress.base import InstallProgress
-from GDebiCommon import GDebiCommon, utf8
 from gettext import gettext as _
 
+from .DebPackage import DebPackage
+from .SimpleGtkbuilderApp import SimpleGtkbuilderApp
+from .GDebiCommon import GDebiCommon, utf8
+
 # the timeout when the termial is expanded if no activity from dpkg
 # is happening 
 GDEBI_TERMINAL_TIMEOUT=4*60.0
@@ -61,27 +62,24 @@
 try:
     import lsb_release
     UBUNTU = lsb_release.get_distro_information()['ID'] == 'Ubuntu'
-except Exception, e:
+except Exception as e:
     pass
 
-class GDebi(SimpleGtkbuilderApp, GDebiCommon):
+class GDebiGtk(SimpleGtkbuilderApp, GDebiCommon):
 
     def __init__(self, datadir, options, file=""):
         GDebiCommon.__init__(self,datadir,options,file)
-        localesApp="gdebi"
-        localesDir="/usr/share/locale"
-
         SimpleGtkbuilderApp.__init__(
-            self, path=datadir+"/gdebi.ui", domain="gdebi")
+            self, path=os.path.join(datadir, "gdebi.ui"), domain="gdebi")
+
         # use a nicer default icon
         icons = Gtk.IconTheme.get_default()
         try:
           logo=icons.load_icon("gnome-mime-application-x-deb", 48, 0)
           if logo != "":
             Gtk.Window.set_default_icon_list([logo])
-        except Exception, e:
-          print "Error loading logo"
-          pass
+        except Exception as e:
+          logging.warn("Error loading logo %s" % e)
 
         # create terminal
         self.vte_terminal = Vte.Terminal()
@@ -193,7 +191,7 @@
                              self.gio_progress_callback, 0):
                 file = gio_dest.get_path()
             self.dialog_gio_download.hide()
-        except Exception, e:
+        except Exception as e:
             self.show_alert(Gtk.MessageType.ERROR, 
                             _("Download failed"),
                             _("Downloading the package failed: "
@@ -255,7 +253,7 @@
         buf = self.textview_description.get_buffer()
         try:
             long_desc = ""
-            raw_desc = string.split(utf8(self._deb["Description"]), "\n")
+            raw_desc = utf8(self._deb["Description"]).split("\n")
             # append a newline to the summary in the first line
             summary = raw_desc[0]
             raw_desc[0] = ""
@@ -306,8 +304,8 @@
             header = store.append(None, [_("Upstream data")])
             for name in self._deb.filelist:
                 store.append(header, [name])
-        except Exception, e:
-            print "Exception while reading the filelist: '%s'" % e
+        except Exception as e:
+            logging.exception("Exception while reading the filelist: '%s'" % e)
             store.clear()
             store.append(None, [_("Error reading filelist")])
         self.treeview_files.set_model(store)
@@ -324,7 +322,7 @@
                 #glib.markup_escape_text(self._deb._failure_string) +
                 self._deb._failure_string + 
                 "</span>")
-	    self.button_install.set_label(_("_Install Package"))
+            self.button_install.set_label(_("_Install Package"))
 
             self.button_install.set_sensitive(False)
             self.button_details.hide()
@@ -404,12 +402,12 @@
         elif parent_path == 0:
             try:
                 data = self._deb.control_content(name)
-            except Exception, e:
+            except Exception as e:
                 data = _("Error reading file content '%s'") % e
         elif parent_path == 1:
             try:
                 data = self._deb.data_content(name)
-            except Exception, e:
+            except Exception as e:
                 data = _("Error reading file content '%s'") % e
         else:
             assert False, "NOT REACHED"
@@ -477,7 +475,7 @@
 
     def on_about_activate(self, widget):
         #print "about"
-        from Version import VERSION
+        from .Version import VERSION
         self.dialog_about.set_version(VERSION)
         self.dialog_about.run()
         self.dialog_about.hide()
@@ -620,16 +618,16 @@
                                                     self.vte_terminal,
                                                     self.label_action,
                                                     self.expander_install)
-            errMsg = None
+            #errMsg = None
             try:
                 res = self._cache.commit(fprogress,iprogress)
-            except IOError, msg:
+            except IOError as msg:
                 res = False
-                errMsg = "%s" % msg
+                #errMsg = "%s" % msg
                 header = _("Could not download all required files")
                 body = _("Please check your internet connection or "
                         "installation medium.")
-            except SystemError, msg:
+            except SystemError as msg:
                 res = False
                 header = _("Could not install all dependencies"),
                 body = _("Usually this is related to an error of the "
@@ -817,7 +815,7 @@
                     logging.exception("lock.release failed")
 
             # get a lock
-            lock = thread.allocate_lock()
+            lock = threading.Lock()
             lock.acquire()
 
             # ui
@@ -872,17 +870,17 @@
                 while True:
                     try:
                         read += os.read(readfd,1)
-                    except OSError, (errno,errstr):
+                    except OSError as e:
                         # resource temporarly unavailable is ignored
                         from errno import EAGAIN
-                        if errno != EAGAIN:
-                            print errstr
+                        if e.errno != EAGAIN:
+                            logging.warn(e.errstr)
                         break
                     self.time_last_update = time.time()
                     if read.endswith("\n"):
-                        statusl = string.split(read, ":")
+                        statusl = read.split(":")
                         if len(statusl) < 3:
-                            print "got garbage from dpkg: '%s'" % read
+                            logging.warn("got garbage from dpkg: '%s'" % read)
                             read = ""
                             break
                         status = statusl[2].strip()
@@ -968,19 +966,19 @@
         
     class FetchProgressAdapter(apt.progress.base.AcquireProgress):
         def __init__(self,progress,action,main):
-            super(GDebi.FetchProgressAdapter, self).__init__()
+            super(GDebiGtk.FetchProgressAdapter, self).__init__()
             self.progress = progress
             self.action = action
             self.main = main
         def start(self):
-            super(GDebi.FetchProgressAdapter, self).start()
+            super(GDebiGtk.FetchProgressAdapter, self).start()
             self.action.set_markup("<i>"+_("Downloading additional package files...")+"</i>")
             self.progress.set_fraction(0)
         def stop(self):
             #print "stop()"
             pass
         def pulse(self, owner):
-            super(GDebi.FetchProgressAdapter, self).pulse(owner)
+            super(GDebiGtk.FetchProgressAdapter, self).pulse(owner)
             at_item = min(self.current_items + 1, self.total_items)
             if self.current_cps > 0:
                 self.progress.set_text(_("File %s of %s at %sB/s") % (at_item,self.total_items,apt_pkg.size_to_str(self.current_cps)))
@@ -1017,18 +1015,19 @@
                 Gtk.main_iteration()
         def done(self):
             self.progressbar.hide()
-        
+
+
 if __name__ == "__main__":
-    app = GDebi("data/",None)
+    app = GDebiGtk("data/",None)
 
     pkgs = ["cw"]
     for pkg in pkgs:
-        print "installing %s" % pkg
+        print("installing %s" % pkg)
         app._cache[pkg].mark_install()
 
     for pkg in app._cache:
         if pkg.marked_install or pkg.marked_upgrade:
-            print pkg.name
+            print(pkg.name)
 
     apt_pkg.pkgsystem_lock()
     app.dialog_deb_install.set_transient_for(app.window_main)
@@ -1043,6 +1042,6 @@
                                            app.label_action,
                                            app.expander_install)
     res = app._cache.commit(fprogress,iprogress)
-    print "commit retured: %s" % res
+    print("commit retured: %s" % res)
     
     Gtk.main()
 
=== modified file 'GDebi/GDebiKDE.py'
--- GDebi/GDebiKDE.py	2012-09-13 20:50:23 +0000
+++ GDebi/GDebiKDE.py	2012-10-12 16:06:23 +0000
@@ -22,27 +22,47 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import logging
 import os
-import subprocess
+import re
 import string
-import re
-import pty
-import warnings
-warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
-import apt_pkg
-
-from PyKDE4.kdecore import *
-from PyKDE4.kdeui import *
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+import sys
+
+
+from PyKDE4.kdeui import (
+    KApplication,
+    KIcon,
+    KMessageBox,
+    DesktopIcon,
+    )
+from PyQt4.QtCore import (
+    Qt,
+    SIGNAL,
+    QStringList,
+    QTimer,
+    )
+from PyQt4.QtGui import (
+    QDialog,
+    QHBoxLayout,
+    QTextCursor,
+    QTextEdit,
+    QTextOption,
+    )
 from PyQt4 import uic
 
 from apt.cache import Cache
-from DebPackage import DebPackage
 
 import gettext
-from GDebiCommon import GDebiCommon, utf8, _
-from KDEAptDialogs import *
+
+from .DebPackage import DebPackage
+from .GDebiCommon import GDebiCommon, utf8, _
+from .KDEAptDialogs import (
+    CacheProgressAdapter,
+    KDEDpkgInstallProgress,
+    KDEFetchProgressAdapter,
+    KDEInstallProgressAdapter,
+    )
+
 
 def __(catalog,str):
     return unicode(gettext.dgettext(catalog, str), 'UTF-8')
@@ -109,19 +129,23 @@
             return
         # block signals so that we do not run into a recursion
         self._block = True
-        para = self.paragraphs() - 1
-        pos = self.paragraphLength(para)
+        #para = self.paragraphs() - 1
+        #pos = self.paragraphLength(para)
         self.moveCursor(QTextCursor.End)
         self._block = False
 
+
 class GDebiKDEDialog(QDialog):
     """Our main user interface, load from UI file"""
     def __init__(self, parent):
         QDialog.__init__(self, parent)
         loadUi("GDebiKDEDialog.ui", self)
 
+
 class GDebiKDE(GDebiCommon, GDebiKDEDialog):
-    def __init__(self,datadir,options,file="",parent = None,name = None,modal = 0,fl = 0):
+
+    def __init__(self, datadir, options, file="", parent=None, name=None,
+                 modal=0, fl=0):
         GDebiKDEDialog.__init__(self,parent)
         GDebiCommon.__init__(self,datadir,options,file)
         # load the icon
@@ -291,9 +315,10 @@
         for r in remove:
             changedList.append(_("To be removed: %s") % r)
 
-        infoReport = KMessageBox.informationList(self,
-                      _("<b>To install the following changes are required:</b>"),
-                      changedList, _("Details"))
+        KMessageBox.informationList(
+            self,
+            _("<b>To install the following changes are required:</b>"),
+            changedList, _("Details"))
 
     def installButtonClicked(self):
         # if not root, start a new instance
@@ -336,16 +361,17 @@
                                                   self.installDialog.installingLabel,
                                                   self.installDialog)
             self.installDialog.konsole.setInstallProgress(iprogress)
-            errMsg = None
+            #errMsg = None
             try:
                 res = self._cache.commit(fprogress,iprogress)
-            except IOError, msg:
+            except IOError as msg:
                 res = False
-                errMsg = "%s" % msg
+                #errMsg = "%s" % msg
                 header = _("Could not download all required files")
                 body = _("Please check your internet connection or "
                             "installation medium.")
-            except SystemError, msg:
+            except SystemError as msg:
+                logging.warn("error: %s" % msg)
                 res = False
                 header = _("Could not install all dependencies")
                 body = _("Usually this is related to an error of the "
 
=== modified file 'GDebi/KDEAptDialogs.py'
--- GDebi/KDEAptDialogs.py	2011-08-16 08:05:17 +0000
+++ GDebi/KDEAptDialogs.py	2012-10-12 16:06:23 +0000
@@ -22,31 +22,28 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
+import logging
 import os
 import subprocess
-import string
+
 import apt
 import apt_pkg
-from PyKDE4.kdecore import *
-from PyKDE4.kdeui import *
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-
-import urllib
-import fcntl
-import posix
-import time
-import thread
-import re
+
+from PyKDE4.kdeui import (
+    KApplication,
+    KMessageBox,
+    KStandardGuiItem,
+    )
+from PyQt4.QtCore import (
+    QTimer,
+    )
+
 import pty
 import select
 
-from apt.cache import Cache
-from apt.debfile import DebPackage
 from apt.progress.base import InstallProgress
-from gettext import gettext as gett
-from GDebiCommon import utf8, _
+
+from .GDebiCommon import utf8, _
 
 
 class KDEDpkgInstallProgress(object):
@@ -66,7 +63,7 @@
         self.progress.setValue(0)
 
     def timeoutHandler(self,signum, frame):
-        raise IOError, "Stopped waiting for I/O."
+        raise IOError("Stopped waiting for I/O.")
 
     def commit(self):
         # ui
@@ -78,7 +75,7 @@
 
         if self.child_pid == 0:
             os.environ["TERM"] = "dumb"
-            if not os.environ.has_key("DEBIAN_FRONTEND"):
+            if not "DEBIAN_FRONTEND" in os.environ:
                 os.environ["DEBIAN_FRONTEND"] = "noninteractive"
             os.environ["APT_LISTCHANGES_FRONTEND"] = "none"
             exitstatus = subprocess.call(argv)
@@ -91,7 +88,7 @@
                 if len(rlist) > 0:
                     line = os.read(self.master_fd, 255)
                     self.parent.konsole.insertWithTermCodes(utf8(line))
-            except Exception, e:
+            except Exception as e:
                 #print e
                 from errno import EAGAIN
                 if hasattr(e, "errno") and e.errno == EAGAIN:
@@ -150,7 +147,7 @@
         # run the base class
         try:
             InstallProgress.updateInterface(self)
-        except ValueError,e:
+        except ValueError as e:
             pass
         # log the output of dpkg (on the master_fd) to the DumbTerminal
         while True:
@@ -163,8 +160,8 @@
                 else:
                     # nothing happend within the timeout, break
                     break
-            except Exception, e:
-                #print "updateInterface: ", e
+            except Exception as e:
+                logging.debug("updateInterface: " % e)
                 break
         KApplication.kApplication().processEvents()
 
@@ -173,7 +170,7 @@
         (self.child_pid, self.master_fd) = pty.fork()
         if self.child_pid == 0:
             os.environ["TERM"] = "dumb"
-            if not os.environ.has_key("DEBIAN_FRONTEND"):
+            if not "DEBIAN_FRONTEND" in os.environ:
                 os.environ["DEBIAN_FRONTEND"] = "noninteractive"
             os.environ["APT_LISTCHANGES_FRONTEND"] = "none"
         return self.child_pid
@@ -182,8 +179,8 @@
         while True:
             try:
                 select.select([self.statusfd],[],[], self.select_timeout)
-            except Exception, e:
-                #print "waitChild: ", e
+            except Exception as e:
+                logging.debug("waitChild: " % e)
                 pass
             self.updateInterface()
             (pid, res) = os.waitpid(self.child_pid,os.WNOHANG)
 
=== modified file 'GDebi/SimpleGtkbuilderApp.py'
--- GDebi/SimpleGtkbuilderApp.py	2011-05-25 16:22:00 +0000
+++ GDebi/SimpleGtkbuilderApp.py	2012-10-12 16:06:23 +0000
@@ -20,9 +20,6 @@
 # USA
 
 import logging
-import os
-import sys
-import re
 
 from gi.repository import Gtk
 
 
=== modified file 'debian/control'
--- debian/control	2012-09-12 21:17:04 +0000
+++ debian/control	2012-10-12 16:06:23 +0000
@@ -6,6 +6,7 @@
            Michael Vogt <[e-mail]>
 Build-Depends: debhelper (>= 8),
                python (>= 2.6.6-3~),
+               python-setuptools,
                intltool
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.3
 
=== modified file 'gdebi'
--- gdebi	2012-09-13 09:44:20 +0000
+++ gdebi	2012-10-12 16:06:23 +0000
@@ -78,7 +78,7 @@
 
     try:
         debi = GDebiCli(options)
-    except SystemError, e:
+    except SystemError as e:
         print "Error opening the cache:\n%s" % e
         sys.exit(1)
     if not debi.open(args[0]):
 
=== modified file 'gdebi-gtk'
--- gdebi-gtk	2012-09-12 22:03:35 +0000
+++ gdebi-gtk	2012-10-12 16:06:23 +0000
@@ -28,7 +28,7 @@
 
 
 from optparse import OptionParser
-from GDebi.GDebi import GDebi
+from GDebi.GDebiGtk import GDebiGtk
 
 from gettext import gettext as _
 import gettext
@@ -64,7 +64,7 @@
 
     try:
         Gtk.init_check(sys.argv)
-    except RuntimeError, e:
+    except RuntimeError as e:
         sys.stderr.write("Can not start %s: %s. Exiting\n" % (sys.argv[0], e))
         sys.exit(1)
 
@@ -73,8 +73,8 @@
         afile = args[0]
         
     try:
-        app = GDebi(datadir=data,options=options,file=afile)
-    except SystemError, e:
+        app = GDebiGtk(datadir=data,options=options,file=afile)
+    except SystemError as e:
         err_header = _("Software index is broken")
         err_body = _("This is a major failure of your software " 
                     "management system. Please check for broken packages "
 
=== modified file 'gdebi-kde'
--- gdebi-kde	2012-09-12 22:03:35 +0000
+++ gdebi-kde	2012-10-12 16:06:23 +0000
@@ -103,7 +103,7 @@
         if options.non_interactive == True:
             gdebi.installButtonClicked()
         app.exec_()
-    except SystemError, e:
+    except SystemError as e:
         err_header = _("Software index is broken")
         err_body = _("This is a major failure of your software " 
                     "management system. Please check for broken packages "
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-07-02 14:52:39 +0000
+++ po/POTFILES.in	2012-10-12 16:06:23 +0000
@@ -6,7 +6,7 @@
 data/gdebi.desktop.in
 gdebi-gtk
 GDebi/DebPackage.py
-GDebi/GDebi.py
+GDebi/GDebiGtk.py
 GDebi/GDebiCli.py
 GDebi/GDebiKDE.py
 GDebi/GDebiCommon.py
 
=== modified file 'setup.py'
--- setup.py	2011-08-28 14:22:30 +0000
+++ setup.py	2012-10-12 16:06:23 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import os
-from distutils.core import setup
+from setuptools import setup
 from glob import glob
 from re import compile
 
@@ -26,6 +26,7 @@
 
 s = setup(name='gdebi',
           version=version,
+          test_suite="tests",
           packages=['GDebi'],
           scripts=['gdebi', 'gdebi-gtk', 'gdebi-kde'],
           data_files=[('share/gdebi/',
 
=== added file 'tests/__init__.py'
=== added file 'tests/test_gdebi_cli.py'
--- tests/test_gdebi_cli.py	1970-01-01 00:00:00 +0000
+++ tests/test_gdebi_cli.py	2012-10-12 16:06:23 +0000
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+
+import os
+import unittest
+
+from mock import Mock
+
+from GDebi.GDebiCli import GDebiCli
+
+
+class GDebiCliTestCase(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        # use classmethod to speed up the tests as the cache is only
+        # read once
+        cls.testdir = os.path.join(os.path.dirname(__file__))
+        mock_options = Mock()
+        mock_options.rootdir = None
+        mock_options.apt_opts = []
+        cls.cli = GDebiCli(options=mock_options)
+
+    def test_against_deb_with_conflict_against_apt(self):
+        res = self.cli.open(os.path.join(self.testdir, "gdebi-test1.deb"))
+        self.assertFalse(res)
+        self.assertEqual(
+            self.cli._deb._failure_string,
+            "Conflicts with the installed package 'apt'")
+
+    def test_against_impossible_dep(self):
+        res = self.cli.open(os.path.join(self.testdir, "gdebi-test2.deb"))
+        self.assertFalse(res)
+
+    def test_against_that_works_with_no_additonal_deps(self):
+        res = self.cli.open(os.path.join(self.testdir, "gdebi-test3.deb"))
+        self.assertTrue(res)
+        self.assertEqual(
+            self.cli.get_dependencies_info(), "")
+
+
+if __name__ == "__main__":
+    unittest.main()
 
=== added file 'tests/test_gdebi_gtk.py'
--- tests/test_gdebi_gtk.py	1970-01-01 00:00:00 +0000
+++ tests/test_gdebi_gtk.py	2012-10-12 16:06:23 +0000
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+
+import os
+import subprocess
+import unittest
+
+
+class GDebiGtkTestCase(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        if not "DISPLAY" in os.environ:
+            DISPLAY = ":42"
+            cls.xvfb = subprocess.Popen(["Xvfb", DISPLAY])
+            os.environ["DISPLAY"] = DISPLAY
+        else:
+            cls.xvfb = None
+
+    @classmethod
+    def tearDownClass(cls):
+        if cls.xvfb:
+            cls.xvfb.kill()
+
+    def setUp(self):
+        from GDebi.GDebiGtk import GDebiGtk
+        datadir = os.path.join(os.path.dirname(__file__), "..", "data")
+        self.app = GDebiGtk(datadir=datadir, options=None)
+    
+    def test_simple(self):
+        self.assertNotEqual(self.app, None)
+
+
+if __name__ == "__main__":
+    unittest.main()
 
=== added file 'tests/test_pyflakes.py'
--- tests/test_pyflakes.py	1970-01-01 00:00:00 +0000
+++ tests/test_pyflakes.py	2012-10-12 16:06:23 +0000
@@ -0,0 +1,15 @@
+import os
+import subprocess
+import unittest
+
+
+class TestPyflakesClean(unittest.TestCase):
+    """ ensure that the tree is pyflakes clean """
+
+    def test_pyflakes_clean(self):
+        path = os.path.join(os.path.dirname(__file__), "..")
+        self.assertEqual(subprocess.call(["pyflakes",  path]), 0)
+
+
+if __name__ == "__main__":
+    unittest.main()