Merge tag '0.9.12' into debian

seveas · seveas · commit 4af29f2498a8 · 2014-07-07T10:00:25.000+02:00
diff --git a/NetworkManager.py b/NetworkManager.py
@@ -50,15 +50,15 @@ def __init__(self, object_path=None):
                 setattr(self.__class__, p, self._make_property(p))
 
     def _make_property(self, name):
-        def get(self):
+        def get_func(self):
             data = self.proxy.Get(self.interface_name, name, dbus_interface='org.freedesktop.DBus.Properties')
             debug("Received property %s.%s" % (self.interface_name, name), data)
             return self.postprocess(name, self.unwrap(data))
-        def set(self, value):
-            data = self.wrap(self.preprocess(name, data))
+        def set_func(self, value):
+            value = self.wrap(self.preprocess(name, (value,), {})[0][0])
             debug("Setting property %s.%s" % (self.interface_name, name), value)
             return self.proxy.Set(self.interface_name, name, value, dbus_interface='org.freedesktop.DBus.Properties')
-        return property(get, set)
+        return property(get_func, set_func)
 
     def unwrap(self, val):
         if isinstance(val, dbus.ByteArray):
@@ -211,6 +211,7 @@ def SpecificDevice(self):
             NM_DEVICE_TYPE_BOND: Bond,
             NM_DEVICE_TYPE_VLAN: Vlan,
             NM_DEVICE_TYPE_ADSL: Adsl,
+            NM_DEVICE_TYPE_BRIDGE: Bridge,
         }[self.DeviceType](self.object_path)
 
     def postprocess(self, name, val):
@@ -392,6 +393,11 @@ def route_to_dbus(route):
 NM_STATE_CONNECTED_LOCAL = 50
 NM_STATE_CONNECTED_SITE = 60
 NM_STATE_CONNECTED_GLOBAL = 70
+NM_CONNECTIVITY_UNKNOWN = 0
+NM_CONNECTIVITY_NONE = 1
+NM_CONNECTIVITY_PORTAL = 2
+NM_CONNECTIVITY_LIMITED = 3
+NM_CONNECTIVITY_FULL = 4
 NM_DEVICE_TYPE_UNKNOWN = 0
 NM_DEVICE_TYPE_ETHERNET = 1
 NM_DEVICE_TYPE_WIFI = 2
@@ -549,3 +555,9 @@ def route_to_dbus(route):
 NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED = 0
 NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED = 1
 NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2
+NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0
+NM_SECRET_AGENT_ERROR_INVALID_CONNECTION = 1
+NM_SECRET_AGENT_ERROR_USER_CANCELED = 2
+NM_SECRET_AGENT_ERROR_AGENT_CANCELED = 3
+NM_SECRET_AGENT_ERROR_INTERNAL_ERROR = 4
+NM_SECRET_AGENT_ERROR_NO_SECRETS = 5
diff --git a/docs/conf.py b/docs/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '0.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.11'
+release = '0.9.12'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/index.rst b/docs/index.rst
@@ -71,7 +71,7 @@ translate them to text. For example:
   >>> NetworkManager.const('device_type', 2)
   'wifi'
 
-.. _`NetworkManager project website`: projects.gnome.org/NetworkManager/developers/api/09/spec.html
+.. _`NetworkManager project website`: https://developer.gnome.org/NetworkManager/0.9/spec.html
 
 List of classes
 ---------------
diff --git a/makeconstants.py b/makeconstants.py
@@ -6,7 +6,8 @@
 enum_regex = re.compile(r'typedef enum(?:\s+[a-zA-Z]+)?\s*\{(.*?)\}', re.DOTALL)
 comment_regex = re.compile(r'/\*.*?\*/', re.DOTALL)
 headers = ['/usr/include/NetworkManager/NetworkManager.h',
-           '/usr/include/NetworkManager/NetworkManagerVPN.h']
+           '/usr/include/NetworkManager/NetworkManagerVPN.h',
+           '/usr/include/libnm-glib/nm-secret-agent.h']
 for h in headers:
     for enum in enum_regex.findall(open(h).read()):
         enum = comment_regex.sub('', enum)
@@ -22,4 +23,3 @@
             key = key.strip()
             print('%s = %d' % (key, val))
             last = val
-
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name = "python-networkmanager",
-      version = "0.9.11",
+      version = "0.9.12",
       author = "Dennis Kaarsemaker",
       author_email = "dennis@kaarsemaker.net",
       url = "http://github.com/seveas/python-networkmanager",
