Diff
Modified: trunk/Tools/ChangeLog (90533 => 90534)
--- trunk/Tools/ChangeLog 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/ChangeLog 2011-07-07 04:11:33 UTC (rev 90534)
@@ -1,5 +1,46 @@
2011-07-06 Adam Barth <[email protected]>
+ Normalize callers of logging.getLogger to use __name__
+ https://bugs.webkit.org/show_bug.cgi?id=64054
+
+ Reviewed by Eric Seidel.
+
+ Most callers were already using __name__. This patch makes everyone
+ consistent.
+
+ * Scripts/webkitpy/common/checkout/diff_parser.py:
+ * Scripts/webkitpy/common/checkout/scm/svn.py:
+ * Scripts/webkitpy/common/net/statusserver.py:
+ * Scripts/webkitpy/common/system/executive.py:
+ * Scripts/webkitpy/common/system/file_lock.py:
+ * Scripts/webkitpy/common/system/user.py:
+ * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+ * Scripts/webkitpy/layout_tests/models/result_summary.py:
+ * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+ * Scripts/webkitpy/layout_tests/port/http_lock.py:
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ * Scripts/webkitpy/layout_tests/port/server_process.py:
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+ * Scripts/webkitpy/layout_tests/port/win.py:
+ * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
+ * Scripts/webkitpy/layout_tests/servers/http_server.py:
+ * Scripts/webkitpy/layout_tests/servers/http_server_base.py:
+ * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ * Scripts/webkitpy/python24/versioning.py:
+ * Scripts/webkitpy/style/checker.py:
+ * Scripts/webkitpy/style/checkers/test_expectations.py:
+ * Scripts/webkitpy/style/patchreader.py:
+ * Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py:
+
+2011-07-06 Adam Barth <[email protected]>
+
Move model classes out of layout_package and into models
https://bugs.webkit.org/show_bug.cgi?id=64053
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -31,7 +31,7 @@
import logging
import re
-_log = logging.getLogger("webkitpy.common.checkout.diff_parser")
+_log = logging.getLogger(__name__)
# FIXME: This is broken. We should compile our regexps up-front
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -41,6 +41,9 @@
from .scm import AuthenticationError, SCM, commit_error_handler
+_log = logging.getLogger(__name__)
+
+
# A mixin class that represents common functionality for SVN and Git-SVN.
class SVNRepository:
def has_authorization_for_realm(self, realm, home_directory=os.getenv("HOME")):
@@ -310,7 +313,6 @@
svn_commit_args.extend(changed_files)
if self.dryrun:
- _log = logging.getLogger("webkitpy.common.system")
_log.debug('Would run SVN command: "' + " ".join(svn_commit_args) + '"')
# Return a string which looks like a commit so that things which parse this output will succeed.
Modified: trunk/Tools/Scripts/webkitpy/common/net/statusserver.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/common/net/statusserver.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/common/net/statusserver.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -36,7 +36,7 @@
import urllib2
-_log = logging.getLogger("webkitpy.common.net.statusserver")
+_log = logging.getLogger(__name__)
class StatusServer:
Modified: trunk/Tools/Scripts/webkitpy/common/system/executive.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/common/system/executive.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -49,7 +49,7 @@
from webkitpy.python24 import versioning
-_log = logging.getLogger("webkitpy.common.system")
+_log = logging.getLogger(__name__)
class ScriptError(Exception):
Modified: trunk/Tools/Scripts/webkitpy/common/system/file_lock.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/common/system/file_lock.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/common/system/file_lock.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -32,7 +32,7 @@
import time
-_log = logging.getLogger("webkitpy.common.system.file_lock")
+_log = logging.getLogger(__name__)
class FileLock(object):
Modified: trunk/Tools/Scripts/webkitpy/common/system/user.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/common/system/user.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/common/system/user.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -36,7 +36,7 @@
import webbrowser
-_log = logging.getLogger("webkitpy.common.system.user")
+_log = logging.getLogger(__name__)
try:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -40,7 +40,7 @@
# A JSON results generator for generic tests.
# FIXME: move this code out of the layout_package directory.
-_log = logging.getLogger("webkitpy.layout_tests.layout_package.json_results_generator")
+_log = logging.getLogger(__name__)
_JSON_PREFIX = "ADD_RESULTS("
_JSON_SUFFIX = ");"
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/result_summary.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/result_summary.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/result_summary.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -36,7 +36,7 @@
from webkitpy.layout_tests.models.test_expectations import TestExpectations
-_log = logging.getLogger(__file__)
+_log = logging.getLogger(__name__)
class ResultSummary(object):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -37,9 +37,10 @@
import webkitpy.thirdparty.simplejson as simplejson
-_log = logging.getLogger("webkitpy.layout_tests.layout_package."
- "test_expectations")
+_log = logging.getLogger(__name__)
+
+
# Test expectation and modifier constants.
# FIXME: range() starts with 0 which makes if expectation checks harder
# as PASS is 0.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -51,9 +51,10 @@
from webkitpy.layout_tests.servers import http_server
from webkitpy.layout_tests.servers import websocket_server
-_log = logging.getLogger("webkitpy.layout_tests.port.chromium")
+_log = logging.getLogger(__name__)
+
class ChromiumPort(Port):
"""Abstract base class for Chromium implementations of the Port class."""
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -33,9 +33,10 @@
import chromium
-_log = logging.getLogger("webkitpy.layout_tests.port.chromium_linux")
+_log = logging.getLogger(__name__)
+
class ChromiumLinuxPort(chromium.ChromiumPort):
"""Chromium Linux implementation of the Port class."""
SUPPORTED_ARCHITECTURES = ('x86', 'x86_64')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -38,9 +38,10 @@
from webkitpy.common.system.executive import Executive
-_log = logging.getLogger("webkitpy.layout_tests.port.chromium_mac")
+_log = logging.getLogger(__name__)
+
class ChromiumMacPort(chromium.ChromiumPort):
"""Chromium Mac implementation of the Port class."""
SUPPORTED_OS_VERSIONS = ('leopard', 'snowleopard', 'future')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -34,9 +34,10 @@
import chromium
-_log = logging.getLogger("webkitpy.layout_tests.port.chromium_win")
+_log = logging.getLogger(__name__)
+
def os_version(windows_version=None):
if not windows_version:
if hasattr(sys, 'getwindowsversion'):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -35,9 +35,10 @@
from webkitpy.layout_tests.port import base, builders, server_process, webkit
-_log = logging.getLogger("webkitpy.layout_tests.port.gtk")
+_log = logging.getLogger(__name__)
+
class GtkDriver(webkit.WebKitDriver):
def start(self):
display_id = self._worker_number + 1
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -40,7 +40,7 @@
from webkitpy.common.system.filesystem import FileSystem
-_log = logging.getLogger("webkitpy.layout_tests.port.http_lock")
+_log = logging.getLogger(__name__)
class HttpLock(object):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -34,9 +34,10 @@
from webkitpy.layout_tests.port.webkit import WebKitPort
-_log = logging.getLogger("webkitpy.layout_tests.port.mac")
+_log = logging.getLogger(__name__)
+
def os_version(os_version_string=None, supported_versions=None):
if not os_version_string:
if hasattr(platform, 'mac_ver') and platform.mac_ver()[0]:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -35,9 +35,10 @@
from webkitpy.layout_tests.port.webkit import WebKitPort
-_log = logging.getLogger("webkitpy.layout_tests.port.qt")
+_log = logging.getLogger(__name__)
+
class QtPort(WebKitPort):
port_name = "qt"
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/server_process.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/server_process.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/server_process.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -41,9 +41,10 @@
from webkitpy.common.system.executive import Executive, ScriptError
-_log = logging.getLogger(__file__)
+_log = logging.getLogger(__name__)
+
class ServerProcess:
"""This class provides a wrapper around a subprocess that
implements a simple request/response usage model. The primary benefit
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -43,7 +43,7 @@
from webkitpy.layout_tests.port import builders, server_process, Port, Driver, DriverOutput
-_log = logging.getLogger(__file__)
+_log = logging.getLogger(__name__)
class WebKitPort(Port):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -32,9 +32,10 @@
from webkitpy.layout_tests.port.webkit import WebKitPort
-_log = logging.getLogger(__file__)
+_log = logging.getLogger(__name__)
+
class WinPort(WebKitPort):
port_name = "win"
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -37,9 +37,10 @@
from webkitpy.layout_tests.servers import http_server_base
-_log = logging.getLogger("webkitpy.layout_tests.servers.apache_http_server")
+_log = logging.getLogger(__name__)
+
class LayoutTestApacheHttpd(http_server_base.HttpServerBase):
def __init__(self, port_obj, output_dir):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -36,8 +36,10 @@
from webkitpy.layout_tests.servers import http_server_base
-_log = logging.getLogger("webkitpy.layout_tests.servers.http_server")
+_log = logging.getLogger(__name__)
+
+
class Lighttpd(http_server_base.HttpServerBase):
def __init__(self, port_obj, output_dir, background="" port=None,
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -36,9 +36,10 @@
import tempfile
import time
-_log = logging.getLogger("webkitpy.layout_tests.servers.http_server_base")
+_log = logging.getLogger(__name__)
+
class ServerError(Exception):
pass
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -37,11 +37,13 @@
from webkitpy.layout_tests.servers import http_server
from webkitpy.layout_tests.servers import http_server_base
-_log = logging.getLogger("webkitpy.layout_tests.servers.websocket_server")
+_log = logging.getLogger(__name__)
+
_WS_LOG_PREFIX = 'pywebsocket.ws.log-'
_WSS_LOG_PREFIX = 'pywebsocket.wss.log-'
+
_DEFAULT_WS_PORT = 8880
_DEFAULT_WSS_PORT = 9323
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -37,9 +37,10 @@
from webkitpy.layout_tests.views.metered_stream import MeteredStream
from webkitpy.layout_tests.models import test_expectations
-# FIXME: Change this to __file__ when we can fix test-webkitpy's logging configuration.
-_log = logging.getLogger("webkitpy.layout_tests.printer")
+_log = logging.getLogger(__name__)
+
+
TestExpectations = test_expectations.TestExpectations
NUM_SLOW_TESTS_TO_LOG = 10
Modified: trunk/Tools/Scripts/webkitpy/python24/versioning.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/python24/versioning.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/python24/versioning.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -25,8 +25,10 @@
import logging
import sys
-_log = logging.getLogger("webkitpy.python24.versioning")
+_log = logging.getLogger(__name__)
+
+
# The minimum Python version the webkitpy package supports.
_MINIMUM_SUPPORTED_PYTHON_VERSION = "2.5"
Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/style/checker.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -49,8 +49,10 @@
from optparser import DefaultCommandOptionValues
from webkitpy.style_references import configure_logging as _configure_logging
-_log = logging.getLogger("webkitpy.style.checker")
+_log = logging.getLogger(__name__)
+
+
# These are default option values for the command-line option parser.
_DEFAULT_MIN_CONFIDENCE = 1
_DEFAULT_OUTPUT_FORMAT = 'emacs'
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -37,9 +37,10 @@
from webkitpy.style_references import port
from webkitpy.style_references import test_expectations
-_log = logging.getLogger("webkitpy.style.checkers.test_expectations")
+_log = logging.getLogger(__name__)
+
class ChromiumOptions(object):
"""A mock object for creating chromium port object.
Modified: trunk/Tools/Scripts/webkitpy/style/patchreader.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/style/patchreader.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/style/patchreader.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -33,7 +33,7 @@
from webkitpy.common.checkout.diff_parser import DiffParser
-_log = logging.getLogger("webkitpy.style.patchreader")
+_log = logging.getLogger(__name__)
class PatchReader(object):
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py (90533 => 90534)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py 2011-07-07 04:04:29 UTC (rev 90533)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py 2011-07-07 04:11:33 UTC (rev 90534)
@@ -33,10 +33,10 @@
import sys
from webkitpy.common.checkout import scm
-_log = logging.getLogger("webkitpy.layout_tests."
- "update-webgl-conformance-tests")
+_log = logging.getLogger(__name__)
+
def remove_first_line_comment(text):
return re.compile(r'^<!--.*?-->\s*', re.DOTALL).sub('', text)
