summaryrefslogtreecommitdiff
path: root/Tools/Scripts/webkitpy/common/system/user_mock.py
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-29 12:18:48 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-29 12:18:57 +0100
commit4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 (patch)
treebed2fe914fe0f7ec70abfb47d2d84af8a3604d09 /Tools/Scripts/webkitpy/common/system/user_mock.py
parent01485457c9a5da3f1121015afd25bb53af77662e (diff)
downloadqtwebkit-4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064.tar.gz
Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119)
New snapshot that includes the fix for installing the QtWebProcess into libexec Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Tools/Scripts/webkitpy/common/system/user_mock.py')
-rw-r--r--Tools/Scripts/webkitpy/common/system/user_mock.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/Tools/Scripts/webkitpy/common/system/user_mock.py b/Tools/Scripts/webkitpy/common/system/user_mock.py
index 16f79a0c4..d17ea9a90 100644
--- a/Tools/Scripts/webkitpy/common/system/user_mock.py
+++ b/Tools/Scripts/webkitpy/common/system/user_mock.py
@@ -26,7 +26,9 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-from webkitpy.common.system.deprecated_logging import log
+import logging
+
+_log = logging.getLogger(__name__)
class MockUser(object):
@@ -52,7 +54,7 @@ class MockUser(object):
pass
def confirm(self, message=None, default='y'):
- log(message)
+ _log.info(message)
return default == 'y'
def can_open_url(self):
@@ -61,6 +63,6 @@ class MockUser(object):
def open_url(self, url):
self.opened_urls.append(url)
if url.startswith("file://"):
- log("MOCK: user.open_url: file://...")
+ _log.info("MOCK: user.open_url: file://...")
return
- log("MOCK: user.open_url: %s" % url)
+ _log.info("MOCK: user.open_url: %s" % url)