Merge lp:~barry/gdebi/lp1301422 into lp:gdebi

[Barry Warsaw]

  * Add a universal_newlines=True to Popen command to get a proper unicode
    object. (LP: #1301422)
  * Whitespace normalization.

[Michael Vogt (mvo)]

Looks good, +1 - thanks!

review: Approve

[Dimitri John Ledkov (xnox)]

review: Approve

=== modified file 'GDebi/GDebiCli.py'
--- GDebi/GDebiCli.py	2013-08-03 10:59:52 +0000
+++ GDebi/GDebiCli.py	2014-04-04 14:03:18 +0000
@@ -68,8 +68,8 @@
 
     def open(self, file):
         try:
-            if (file.endswith(".deb") or 
-                "Debian binary package" in Popen(["file", file], stdout=PIPE).communicate()[0]):
+            if (file.endswith(".deb") or
+                "Debian binary package" in Popen(["file", file], stdout=PIPE, universal_newlines=True).communicate()[0]):
                 self._deb = DebPackage(file, self._cache)
             elif (file.endswith(".dsc") or
                   os.path.basename(file) == "control"):
@@ -90,7 +90,7 @@
             sys.stderr.write(self._deb._failure_string + "\n")
             return False
         return True
-            
+
     def show_description(self):
         try:
             print(self._deb["Description"])
@@ -114,7 +114,7 @@
                 s += pkgname + " "
             s += "\n"
         if len(install) > 0:
-            s += _("Requires the installation of the following packages: ") 
+            s += _("Requires the installation of the following packages: ")
             for pkgname in install:
                 s += pkgname + " "
             s += "\n"
@@ -133,7 +133,7 @@
                 return 1
 
         # install the package itself
-        if self._deb.filename.endswith(".dsc"): 
+        if self._deb.filename.endswith(".dsc"):
             # FIXME: add option to only install build-dependencies
             #        (or build+install the deb) and then enable
             #        this code
@@ -145,7 +145,7 @@
             return 0
         else:
             return call(["dpkg","--auto-deconfigure", "-i",self._deb.filename])
-        
+
 
 if __name__ == "__main__":
     app = GDebiCli()

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-02 09:52:37 +0000
+++ debian/changelog	2014-04-04 14:03:18 +0000
@@ -1,3 +1,11 @@
+gdebi (0.9.5.2) unstable; urgency=medium
+
+  * Add a universal_newlines=True to Popen command to get a proper unicode
+    object.  (LP: #1301422)
+  * Whitespace normalization.
+
+ -- Barry Warsaw <[e-mail]>  Fri, 04 Apr 2014 09:48:25 -0400
+
 gdebi (0.9.5.1) unstable; urgency=medium
 
   * Lower required python3 version to 3.3. As 3.4 is not needed, and