Merge lp:~brunonova/software-properties/lp1383289 into lp:software-properties

[Bruno Nova]

Dragging a key into the list of keys in the "Authentication" tab fails. This commit fixes this.
I tested only the GTK version! I don't know if the problem exists in the KDE one!

Note: in softwareproperties/gtk/SoftwarePropertiesGtk.py, I replaced one occurrence of "selection.data.strip()" by "selection.get_data().strip()".
But there is another occurrence of "selection.data.strip()" in that file, which is not used here. I haven't touched it because I am not sure if "selection" there is also of type "SelectionData". If it is, then that occurrence should be corrected as well!

[Michael Vogt (mvo)]

review: Approve

=== modified file 'softwareproperties/SoftwareProperties.py'
--- softwareproperties/SoftwareProperties.py	2014-09-24 09:50:37 +0000
+++ softwareproperties/SoftwareProperties.py	2014-10-20 14:19:54 +0000
@@ -811,9 +811,9 @@
   def add_key_from_data(self, keydata):
     "Add a gnupg key from a data string (e.g. copy-n-paste)"
     tmp = tempfile.NamedTemporaryFile()
-    tmp.write(keydata.encode())
+    tmp.write(keydata)
     tmp.flush()
-    return self.add_key(tmp.name)
+    return self.backend.AddKey(tmp.name)
 
   def remove_key(self, keyid):
     """Remove a gnupg key from the list of trusted software vendors"""
 
=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2014-01-10 11:23:05 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2014-10-20 14:19:54 +0000
@@ -756,7 +756,7 @@
     def on_auth_drag_data_received(self, widget, context, x, y,
                                    selection, target_type, timestamp):
         """Extract the dropped key and add it to the keyring"""
-        keydata = selection.data.strip()
+        keydata = selection.get_data().strip()
         if not self.add_key_from_data(keydata):
             error(self.window_main,
                   _("Error importing key"),