/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to keyring.py

  • Committer: John Ferlito
  • Date: 2009-10-06 13:57:12 UTC
  • mto: This revision was merged to the branch mainline in revision 668.
  • Revision ID: johnf@inodes.org-20091006135712-22vfb36os1toe5qb
Encoding key is now deprecated in the FreeDesktop standard

Show diffs side-by-side

added added

removed removed

Lines of Context:
keyring.py
77
77
                gnomekeyring.ITEM_NETWORK_PASSWORD, attrs)
78
78
            credentials["user"] = items[0].attributes["user"]
79
79
            credentials["password"] = items[0].secret
80
 
        except (gnomekeyring.NoMatchError, gnomekeyring.DeniedError, gnomekeyring.NoKeyringDaemonError,
81
 
                gnomekeyring.IOError), e:
82
 
            from bzrlib import trace
83
 
            trace.mutter('Unable to obtain credentials for %r from GNOME keyring: %r',
84
 
                         attrs, e)
 
80
        except (gnomekeyring.NoMatchError, gnomekeyring.DeniedError, gnomekeyring.NoKeyringDaemonError):
85
81
            return None