Diff
Modified: trunk/Tools/ChangeLog (107135 => 107136)
--- trunk/Tools/ChangeLog 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/ChangeLog 2012-02-08 23:08:24 UTC (rev 107136)
@@ -1,3 +1,40 @@
+2012-02-08 Adam Barth <[email protected]>
+
+ Stop importing with_statement from the mysterious future
+ https://bugs.webkit.org/show_bug.cgi?id=78156
+
+ Reviewed by Eric Seidel.
+
+ The future is now! (Well, at least 2008, when Python 2.6 was released,
+ is no longer the __future__.)
+
+ * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+ * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+ * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+ * Scripts/webkitpy/common/net/credentials_unittest.py:
+ * Scripts/webkitpy/common/net/file_uploader.py:
+ * Scripts/webkitpy/common/newstringio_unittest.py:
+ * Scripts/webkitpy/common/system/autoinstall.py:
+ * Scripts/webkitpy/common/system/crashlogs.py:
+ * Scripts/webkitpy/common/system/fileset.py:
+ * Scripts/webkitpy/common/system/filesystem.py:
+ * Scripts/webkitpy/common/system/filesystem_unittest.py:
+ * Scripts/webkitpy/common/system/path.py:
+ * Scripts/webkitpy/common/thread/threadedmessagequeue.py:
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (of):
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+ * Scripts/webkitpy/layout_tests/port/test.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ * Scripts/webkitpy/style/filereader_unittest.py:
+ * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
+ * Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py:
+ * Scripts/webkitpy/tool/commands/analyzechangelog.py:
+ * Scripts/webkitpy/tool/commands/queues.py:
+ * Scripts/webkitpy/tool/servers/reflectionhandler.py:
+ * Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py:
+
2012-02-08 Rob Buis <[email protected]>
[BlackBerry] Upstream DumpRenderTreeBlackBerry
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,8 +26,6 @@
# (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 __future__ import with_statement
-
import codecs
import os
import tempfile
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,8 +26,6 @@
# (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 __future__ import with_statement
-
import codecs
import os
import shutil
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -28,8 +28,6 @@
# (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 __future__ import with_statement
-
import atexit
import base64
import codecs
Modified: trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,8 +26,6 @@
# (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 __future__ import with_statement
-
import os
import tempfile
import unittest
Modified: trunk/Tools/Scripts/webkitpy/common/net/file_uploader.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/net/file_uploader.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/net/file_uploader.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -27,8 +27,6 @@
# (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 __future__ import with_statement
-
import codecs
import mimetypes
import socket
Modified: trunk/Tools/Scripts/webkitpy/common/newstringio_unittest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/newstringio_unittest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/newstringio_unittest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -29,8 +29,6 @@
"""Unit tests for newstringio module."""
-from __future__ import with_statement
-
import unittest
import newstringio
Modified: trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -31,8 +31,6 @@
"""Support for automatically downloading Python packages from an URL."""
-from __future__ import with_statement
-
import codecs
import logging
import new
Modified: trunk/Tools/Scripts/webkitpy/common/system/crashlogs.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/system/crashlogs.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/system/crashlogs.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,8 +26,6 @@
# (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 __future__ import with_statement
-
import os
import re
import sys
Modified: trunk/Tools/Scripts/webkitpy/common/system/fileset.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/system/fileset.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/system/fileset.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -21,8 +21,6 @@
# (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 __future__ import with_statement
-
from webkitpy.common.system.filesystem import FileSystem
Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -28,8 +28,6 @@
"""Wrapper object for the file system / source tree."""
-from __future__ import with_statement
-
import codecs
import errno
import exceptions
Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -31,8 +31,6 @@
# important; without it, Python will choke while trying to parse the file,
# since it includes non-ASCII characters.
-from __future__ import with_statement
-
import os
import stat
import sys
Modified: trunk/Tools/Scripts/webkitpy/common/system/path.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/system/path.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/system/path.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -27,7 +27,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""generic routines to convert platform-specific paths to URIs."""
-from __future__ import with_statement
import atexit
import subprocess
Modified: trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,8 +26,6 @@
# (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 __future__ import with_statement
-
import threading
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -35,8 +35,6 @@
create a final report.
"""
-from __future__ import with_statement
-
import errno
import logging
import math
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -27,11 +27,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.
-"""Abstract base class of Port-specific entrypoints for the layout tests
+"""Abstract base class of Port-specific entry points for the layout tests
test infrastructure (the Port and Driver classes)."""
-from __future__ import with_statement
-
import cgi
import difflib
import errno
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,10 +26,6 @@
# (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 __future__ import with_statement
-
-"""WebKit Gtk implementation of the Port interface."""
-
import logging
import os
import signal
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -27,9 +27,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""Dummy Port implementation used for testing."""
-from __future__ import with_statement
-
import base64
import sys
import time
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -29,10 +29,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""Unit tests for run_webkit_tests."""
-
-from __future__ import with_statement
-
import codecs
import itertools
import logging
Modified: trunk/Tools/Scripts/webkitpy/style/filereader_unittest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/style/filereader_unittest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/style/filereader_unittest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -20,10 +20,6 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""Contains unit tests for filereader.py."""
-
-from __future__ import with_statement
-
import unittest
from webkitpy.common.system.filesystem import FileSystem
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -41,8 +41,6 @@
At the end, the script generates a html that compares old and new baselines.
"""
-from __future__ import with_statement
-
import copy
import logging
import optparse
Modified: trunk/Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -23,8 +23,6 @@
# (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 __future__ import with_statement
-
import glob
import logging
import optparse
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/analyzechangelog.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/tool/commands/analyzechangelog.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/analyzechangelog.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,8 +26,6 @@
# (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 __future__ import with_statement
-
import json
import re
import time
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -27,8 +27,6 @@
# (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 __future__ import with_statement
-
import codecs
import os
import sys
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,8 +26,6 @@
# (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 __future__ import with_statement
-
try:
import json
except ImportError:
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py (107135 => 107136)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py 2012-02-08 22:44:00 UTC (rev 107135)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py 2012-02-08 23:08:24 UTC (rev 107136)
@@ -26,8 +26,6 @@
# (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 __future__ import with_statement
-
import codecs
import os
import tempfile
