Merge lp:~xnox/gdebi/pyflakes into lp:gdebi

[Dimitri John Ledkov]

[Michael Vogt (mvo)]

Looks great, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-28 22:12:29 +0000
+++ debian/changelog	2014-02-28 22:51:15 +0000
@@ -5,6 +5,8 @@
 
   [ Dimitri John Ledkov ]
   * Auto-allocate Xserver to run tests under xvfb-run.
+  * Add top-level executable scripts to pyflakes test.
+  * Check using both pyflakes and pyflakes3.
 
  -- Dimitri John Ledkov <[e-mail]>  Fri, 28 Feb 2014 22:10:48 +0000
 

=== modified file 'gdebi'
--- gdebi	2013-03-22 19:48:43 +0000
+++ gdebi	2014-02-28 22:51:15 +0000
@@ -29,7 +29,6 @@
 	unicode = lambda *args: args[0]
 
 import sys
-import apt
 import os.path
 import gettext
 from gettext import gettext as _

=== modified file 'gdebi-gtk'
--- gdebi-gtk	2013-03-22 19:58:44 +0000
+++ gdebi-gtk	2014-02-28 22:51:15 +0000
@@ -29,9 +29,6 @@
 	unicode = lambda *args: args[0]
 
 import sys
-import apt
-import os.path
-
 
 from optparse import OptionParser
 from GDebi.GDebiGtk import GDebiGtk

=== modified file 'gdebi-kde'
--- gdebi-kde	2013-03-22 19:58:44 +0000
+++ gdebi-kde	2014-02-28 22:51:15 +0000
@@ -23,23 +23,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
-import os
-import subprocess
-import string
-import apt
-import apt_pkg
-import os.path
-from PyKDE4.kdecore import *
-from PyKDE4.kdeui import *
-
-import urllib
-import fcntl
-import posix
-import time
-import thread
-import re
-import pty
-import select
+from PyKDE4.kdecore import KCmdLineArgs, KAboutData, KCmdLineOptions
+from PyKDE4.kdeui import KApplication, KMessageBox, ki18n
 
 from optparse import OptionParser
 from GDebi.GDebiKDE import GDebiKDE

=== modified file 'tests/test_pyflakes.py'
--- tests/test_pyflakes.py	2012-10-12 16:02:29 +0000
+++ tests/test_pyflakes.py	2014-02-28 22:51:15 +0000
@@ -7,8 +7,14 @@
     """ 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)
+        paths = [
+            os.path.join(os.path.dirname(__file__), ".."),
+            os.path.join(os.path.dirname(__file__), "..", "gdebi"),
+            os.path.join(os.path.dirname(__file__), "..", "gdebi-gtk"),
+            os.path.join(os.path.dirname(__file__), "..", "gdebi-kde"),
+            ]                                    
+        self.assertEqual(subprocess.call(["pyflakes",] +  paths), 0)
+        self.assertEqual(subprocess.call(["pyflakes3",] +  paths), 0)
 
 
 if __name__ == "__main__":