/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: Vincent Ladeuil
  • Date: 2010-02-24 07:47:17 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20100224074717-gac36h7b3wmhp91x
Fix 2.1.0 compatibility issue.

* diff.py:
(MergeDirectiveController.perform_merge): Fix 2.1.0 deprecation
warnings.

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