diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/common/net/credentials.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/common/net/credentials.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Tools/Scripts/webkitpy/common/net/credentials.py b/Tools/Scripts/webkitpy/common/net/credentials.py index 21aeaeafe..7038b7e3c 100644 --- a/Tools/Scripts/webkitpy/common/net/credentials.py +++ b/Tools/Scripts/webkitpy/common/net/credentials.py @@ -29,6 +29,7 @@ # # Python module for reading stored web credentials from the OS. +import logging import os import platform import re @@ -36,7 +37,6 @@ import re from webkitpy.common.checkout.scm import Git from webkitpy.common.system.executive import Executive, ScriptError from webkitpy.common.system.user import User -from webkitpy.common.system.deprecated_logging import log try: # Use keyring, a cross platform keyring interface, as a fallback: @@ -45,6 +45,8 @@ try: except ImportError: keyring = None +_log = logging.getLogger(__name__) + class Credentials(object): _environ_prefix = "webkit_bugzilla_" @@ -98,15 +100,15 @@ class Credentials(object): if username: security_command += ["-a", username] - log("Reading Keychain for %s account and password. " - "Click \"Allow\" to continue..." % self.host) + _log.info("Reading Keychain for %s account and password. " + "Click \"Allow\" to continue..." % self.host) try: return self.executive.run_command(security_command) except ScriptError: # Failed to either find a keychain entry or somekind of OS-related # error occured (for instance, couldn't find the /usr/sbin/security # command). - log("Could not find a keychain entry for %s." % self.host) + _log.error("Could not find a keychain entry for %s." % self.host) return None def _credentials_from_keychain(self, username=None): |