Merge tag '0.9.13' into debian

seveas · seveas · commit 0bc32de1373f · 2015-03-04T16:58:13.000+01:00
diff --git a/COPYING b/COPYING
@@ -1,5 +1,5 @@
 python-networkmanager - Easy communication with NetworkManager
-Copyright (C) 2011 Dennis Kaarsemaker <dennis@kaarsemaker.net>
+Copyright (C) 2011-2015 Dennis Kaarsemaker <dennis@kaarsemaker.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/NetworkManager.py b/NetworkManager.py
@@ -1,7 +1,7 @@
 # NetworkManager - a library to make interacting with the NetworkManager daemon
 # easier.
 #
-# (C)2011-2013 Dennis Kaarsemaker
+# (C)2011-2015 Dennis Kaarsemaker
 # License: GPL3+
 
 import dbus
@@ -141,6 +141,8 @@ def preprocess(self, name, args, kwargs):
             for key in settings:
                 if 'mac-address' in settings[key]:
                     settings[key]['mac-address'] = fixups.mac_to_dbus(settings[key]['mac-address'])
+                if 'cloned-mac-address' in settings[key]:
+                    settings[key]['cloned-mac-address'] = fixups.mac_to_dbus(settings[key]['cloned-mac-address'])
                 if 'bssid' in settings[key]:
                     settings[key]['bssid'] = fixups.mac_to_dbus(settings[key]['mac-address'])
             if 'ssid' in settings.get('802-11-wireless', {}):
@@ -184,6 +186,8 @@ def postprocess(self, name, val):
                 val_ = val[key]
                 if 'mac-address' in val_:
                     val_['mac-address'] = fixups.mac_to_python(val_['mac-address'])
+                if 'cloned-mac-address' in val_:
+                    val_['cloned-mac-address'] = fixups.mac_to_python(val_['cloned-mac-address'])
                 if 'bssid' in val_:
                     val_['bssid'] = fixups.mac_to_python(val_['bssid'])
             if 'ipv4' in val:
@@ -225,6 +229,8 @@ class AccessPoint(NMDbusInterface):
     def postprocess(self, name, val):
         if name == 'Ssid':
             return fixups.ssid_to_python(val)
+        elif name == 'Strength':
+            return fixups.strength_to_python(val)
         return val
 
 class Wired(NMDbusInterface):
@@ -326,6 +332,10 @@ def ssid_to_dbus(ssid):
             ssid = ssid.encode('utf-8')
         return [dbus.Byte(x) for x in ssid]
 
+    @staticmethod
+    def strength_to_python(strength):
+        return struct.unpack('B', strength)[0]
+
     @staticmethod
     def mac_to_python(mac):
         return "%02X:%02X:%02X:%02X:%02X:%02X" % tuple([ord(x) for x in mac])
@@ -412,9 +422,12 @@ def route_to_dbus(route):
 NM_DEVICE_TYPE_VLAN = 11
 NM_DEVICE_TYPE_ADSL = 12
 NM_DEVICE_TYPE_BRIDGE = 13
+NM_DEVICE_TYPE_GENERIC = 14
+NM_DEVICE_TYPE_TEAM = 15
 NM_DEVICE_CAP_NONE = 0
 NM_DEVICE_CAP_NM_SUPPORTED = 1
 NM_DEVICE_CAP_CARRIER_DETECT = 2
+NM_DEVICE_CAP_IS_SOFTWARE = 4
 NM_WIFI_DEVICE_CAP_NONE = 0
 NM_WIFI_DEVICE_CAP_CIPHER_WEP40 = 1
 NM_WIFI_DEVICE_CAP_CIPHER_WEP104 = 2
@@ -519,6 +532,11 @@ def route_to_dbus(route):
 NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52
 NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53
 NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54
+NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED = 55
+NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED = 56
+NM_DEVICE_STATE_REASON_MODEM_FAILED = 57
+NM_DEVICE_STATE_REASON_MODEM_AVAILABLE = 58
+NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT = 59
 NM_DEVICE_STATE_REASON_LAST = 65535
 NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0
 NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1
diff --git a/docs/conf.py b/docs/conf.py
@@ -41,7 +41,7 @@
 
 # General information about the project.
 project = u'python-networkmanager'
-copyright = u'2011-2013, Dennis Kaarsemaker'
+copyright = u'2011-2015, Dennis Kaarsemaker'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '0.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.12'
+release = '0.9.13'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/examples/ssids.py b/examples/ssids.py
@@ -0,0 +1,11 @@
+"""
+Display all visible SSIDs
+"""
+
+import NetworkManager
+
+for dev in NetworkManager.NetworkManager.GetDevices():
+    if dev.DeviceType != NetworkManager.NM_DEVICE_TYPE_WIFI:
+        continue
+    for ap in dev.SpecificDevice().GetAccessPoints():
+        print '%-30s %dMHz %d%%' % (ap.Ssid, ap.Frequency, ap.Strength)
diff --git a/n-m b/n-m
@@ -3,7 +3,7 @@
 # Command-line tool to interact with NetworkManager. With this tool, you can
 # inspect various configuration items and (de-)activate connections.
 #
-# (C) 2011-2013 Dennis Kaarsemaker
+# (C) 2011-2015 Dennis Kaarsemaker
 # License: GPL3+
 
 from __future__ import print_function
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name = "python-networkmanager",
-      version = "0.9.12",
+      version = "0.9.13",
       author = "Dennis Kaarsemaker",
       author_email = "dennis@kaarsemaker.net",
       url = "http://github.com/seveas/python-networkmanager",

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Command-line tool to interact with NetworkManager. With this tool, you can`
`4`	`4`	`# inspect various configuration items and (de-)activate connections.`
`5`	`5`	`#`
`6`		`-# (C) 2011-2013 Dennis Kaarsemaker`
	`6`	`+# (C) 2011-2015 Dennis Kaarsemaker`
`7`	`7`	`# License: GPL3+`
`8`	`8`
`9`	`9`	`from __future__ import print_function`