← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ubuntu-sso-client/quantal-proposed

« back to all changes in this revision

Viewing changes to ubuntu_sso/networkstate/linux.py

  • Committer: Package Import Robot
  • Author(s): Rodney Dawes
  • Date: 2012-06-27 15:10:41 UTC
  • mfrom: (1.1.38)
  • Revision ID: package-import@ubuntu.com-20120627151041-ncy0p12p1kct0h7j
Tags: 3.99.1-0ubuntu1
https://launchpad.net/bugs/1007109
https://launchpad.net/bugs/1009107
https://launchpad.net/bugs/1014772
https://launchpad.net/bugs/1016151
https://launchpad.net/bugs/1016707
https://launchpad.net/bugs/1016711
* New upstream release.
  - Handle type annotation when printed from gsettings. (LP: #1007109)
  - Remove back buttons in sign in/up pages. (LP: #1009107)
  - Disable tests broken by GTK+ 3.5 behavior change. (LP: #1014772)
  - Remove code duplication with dirspec. (LP: #1016151)
  - Stop using deprecated dict iteritems/itervalues calls. (LP: #1016707)
  - Stop using deprecated exception handling method. (LP: #1016711)
* debian/control:
  - Update dependencies.
* debian/*.install:
  - Remove modules that duplicated code with dirspec.
* debian/patches:
  - Remove upstreamed patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu_sso/networkstate/linux.py
79
79
            # the user has connected in some other way
80
80
            self.call_result_cb(ONLINE)
81
81
        else:
82
 
            logger.error("Error contacting NetworkManager: %s" % \
 
82
            logger.error("Error contacting NetworkManager: %s" %
83
83
                             str(error))
84
84
            self.call_result_cb(UNKNOWN)
85
85
 
107
107
            nm_proxy.Get(NM_DBUS_INTERFACE, "State",
108
108
                         reply_handler=self.got_state,
109
109
                         error_handler=self.got_error)
110
 
        except Exception, e:  # pylint: disable=W0703
 
110
        except Exception as e:  # pylint: disable=W0703
111
111
            self.got_error(e)
112
112
 
113
113
 
127
127
    try:
128
128
        network = NetworkManagerState(got_state)
129
129
        network.find_online_state()
130
 
    except Exception, e:
 
130
    except Exception as e:
131
131
        logger.exception('is_machine_connected failed with:')
132
132
        d.errback(NetworkFailException(e))
133
133
    # pylint: enable=W0702, W0703