Import Debian changes 1.12.2-0ubuntu3

network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium

  * debian/rules:
    - use --with-libnm-glib, the default reversed since that's a legacy
      library but we still need it for unity-control-center

network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium

  * debian/patches/git-newglib-test.patch:
    - backport upstream commit to fix the tests with the new glib 

network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium

  * New upstream version
  * d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
    d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
    d/p/git_thunderbolt_connect.patch:
    - removed, those changes are in the new version
  * Backport Debian changes
  * Update symbols file for libnm0
  * Enable iwd support
  * Drop version requirements when oldstable ships a newer version
  * Drop dh_strip override, the dbgsym migration is done
  * Rebase patches
  * Make sure the example server.conf is actually installed
  * Update install path for plugins, it now includes a version number
  * Drop libnl3 build dependency.
    Upstream has copied the code directly from libnl3 for the few functions it
    needs with a few small modifications.
  * Drop libiw build dependency.
    Hasn't been needed for a long time and was simply a left over from older
    releases.
  * Bump Standards-Version to 4.1.5
  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)

1 files changed, 7 insertions, 7 deletions

diff --git a/examples/python/dbus/update-secrets.py b/examples/python/dbus/update-secrets.py
index 13cac1b0..1fc73209 100755
--- a/examples/python/dbus/update-secrets.py
+++ b/examples/python/dbus/update-secrets.py
@@ -22,7 +22,7 @@
 # Update() method. The method replaces all previous settings with new ones
 # including possible secrets.
 # So, we get all settings using GetSettings() and then find out what secrets
-# are associated with the connection using GetSecrets(), ask for new secret 
+# are associated with the connection using GetSecrets(), ask for new secret
 # values, and add them to the settings that we pass to Update().
 #
 
@@ -37,16 +37,16 @@ def change_secrets_in_one_setting(proxy, config, setting_name):
         # returns a dict of dicts mapping name::setting, where setting is a dict
         # mapping key::value.  Each member of the 'setting' dict is a secret
         secrets = proxy.GetSecrets(setting_name)
-        print "Current secrets:", secrets
+        print("Current secrets:" + secrets)
 
         # Ask user for new secrets and put them into our connection config
         for setting in secrets:
             for key in secrets[setting]:
                 new_secret = raw_input ("Enter new secret for '%s' in '%s': " % (key, setting))
                 config[setting_name][key] = new_secret
-    except Exception, e:
+    except Exception as e:
         #code = str(e).split(':')[0]
-        #print "Exception:", str(e)
+        #print("Exception:" + str(e))
         pass
 
 def change_secrets(con_path, config):
@@ -76,7 +76,7 @@ def find_connection(name):
         connection = dbus.Interface(con_proxy, "org.freedesktop.NetworkManager.Settings.Connection")
         try:
             config = connection.GetSettings()
-        except Exception, e:
+        except Exception as e:
             pass
 
         # Find connection by the id
@@ -101,10 +101,10 @@ if len(sys.argv) != 2:
 # Find the connection
 con = find_connection(sys.argv[1])
 
-print "Connection found: ", con_path
+print("Connection found: " + con_path)
 
 if con:
-    # Obtain new secrets and put then into connection dict 
+    # Obtain new secrets and put then into connection dict
     change_secrets(con_path, con)
 
     # Change the connection with Update()