Stop importing with_statement from the mysterious future
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Feb 2012 23:08:24 +0000 (23:08 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Feb 2012 23:08:24 +0000 (23:08 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@107136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

26 files changed:
Tools/ChangeLog
Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py
Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py
Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py
Tools/Scripts/webkitpy/common/net/credentials_unittest.py
Tools/Scripts/webkitpy/common/net/file_uploader.py
Tools/Scripts/webkitpy/common/newstringio_unittest.py
Tools/Scripts/webkitpy/common/system/autoinstall.py
Tools/Scripts/webkitpy/common/system/crashlogs.py
Tools/Scripts/webkitpy/common/system/fileset.py
Tools/Scripts/webkitpy/common/system/filesystem.py
Tools/Scripts/webkitpy/common/system/filesystem_unittest.py
Tools/Scripts/webkitpy/common/system/path.py
Tools/Scripts/webkitpy/common/thread/threadedmessagequeue.py
Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
Tools/Scripts/webkitpy/layout_tests/port/base.py
Tools/Scripts/webkitpy/layout_tests/port/gtk.py
Tools/Scripts/webkitpy/layout_tests/port/test.py
Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
Tools/Scripts/webkitpy/style/filereader_unittest.py
Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py
Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py
Tools/Scripts/webkitpy/tool/commands/analyzechangelog.py
Tools/Scripts/webkitpy/tool/commands/queues.py
Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py
Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py

index 3b86224406fd4205d82f7c8a2d917d6b5195a405..7f32b0f93df4a49617d6a0d09d979044fe236432 100644 (file)
@@ -1,3 +1,40 @@
+2012-02-08  Adam Barth  <abarth@webkit.org>
+
+        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  <rbuis@rim.com>
 
         [BlackBerry] Upstream DumpRenderTreeBlackBerry
index 0221bcee9b86f17d706eeb456bfef3aee01d69a4..db4a55b06e07ffaa5519e2e1e7f231b95f08237c 100644 (file)
@@ -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
index 3b094324787eec965b500a6df668dfe4a1e2b7c7..78d25cb31237312187dd6f85ff3c2080e1dd8455 100644 (file)
@@ -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
index 209bd3510a16b4d659d032172ddbc6238c082f9e..b835cdf67a98219cd8ec6e5f542d4e99e0873862 100644 (file)
@@ -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
index 59048591fa69033390757360812d7a780d1ff595..2ab160c887c289a5cc5904d048289196f2f514cc 100644 (file)
@@ -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
index aa3488bbf029bf8cae49bb3429846f22d48a34c0..339045e6a941fd9169819ef9e499d9fc50e28d75 100644 (file)
@@ -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
index 5755c98143dd3489b6e051e3f9d996ed5f08bd09..1ee2fb91f92c07f7f866ce09c5cdbd722183a8ba 100644 (file)
@@ -29,8 +29,6 @@
 
 """Unit tests for newstringio module."""
 
-from __future__ import with_statement
-
 import unittest
 
 import newstringio
index 4ffcccc64655763cb7dc3c7db6f374cd4be247b1..8be85459616a0bde30ddcc1dfaf5d39fe7f60b20 100755 (executable)
@@ -31,8 +31,6 @@
 """Support for automatically downloading Python packages from an URL."""
 
 
-from __future__ import with_statement
-
 import codecs
 import logging
 import new
index 06b0d12d7058c496d8e65c9a18aa65b1c700b3a9..a6b6575f60413113ca61f1f794a336ee9289a690 100644 (file)
@@ -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
index 598c1c595de752c9522ff1e726d96af64f018326..57e9a284e91799e6f3cfcd1918e556bb75c073d9 100644 (file)
@@ -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
 
 
index 7de41a424d1bbcf951beca2fe8e4a549421a6d82..75384f75230776162c951ee96b1772e3353ff06c 100644 (file)
@@ -28,8 +28,6 @@
 
 """Wrapper object for the file system / source tree."""
 
-from __future__ import with_statement
-
 import codecs
 import errno
 import exceptions
index c24344c7696a436c583c187db3fcb3b648d90110..4859f7294bf1a17a97f48eb583b87b0ed7def865 100644 (file)
@@ -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
index 09787d7e82ddaa45c8023e6d90bc0a0a051a457c..b7ad3723a306006497064ed7ef8f94d4e108ea74 100644 (file)
@@ -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
index 17b62773cdbf3412049737e4ada7e8b23682961f..e43476764209e4a7332d61ebbd4fc191e483f858 100644 (file)
@@ -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
 
 
index 7b163a9845b158f9f79cd666b597de6ee2bdb8ec..7113bcb6a3eacc1dcdc9126ace1965a92d74cbb7 100644 (file)
@@ -35,8 +35,6 @@ objects to the Manager. The Manager then aggregates the TestFailures to
 create a final report.
 """
 
-from __future__ import with_statement
-
 import errno
 import logging
 import math
index 43454062b027827ce5343afde40cec5bd2c3e20d..ba2c382388998dae05041f12661fd86687b40c10 100755 (executable)
 # (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
index 745ff156503817300e520597f03c005e9153cdb5..c9ee1cbfe6d35a69ee557cb9888284daa4f2076d 100644 (file)
 # (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
index 35ff21c5e958d3d990a7895cd973adfe20d75fff..99c7ce921d2d6a7ea452e576aa680e4bebb65039 100644 (file)
@@ -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
index e872d58cf404675fcf432ad0863f4a908dc59ab3..6e013d3dc764301520a595d41a6bae9dd577da4e 100755 (executable)
 # (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
index a7b2edb3dac0fed5549acffadab3e31d52302f7b..bcf94f33e67875209e0ab25786710ca7340cc62b 100644 (file)
 # 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
index e2ab571c84d0335af5f9aeedd27b84dc40ba0efc..2219879f278d969a2459f7714ebab279536c04c1 100644 (file)
@@ -41,8 +41,6 @@ The script does the following for each platform specified:
 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
index 1196980b27dc0f337569beb191c5bc96313d2222..68c2fb7f504de3e27d068ebb13ced5ad3580dd52 100755 (executable)
@@ -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
index 2fe34ade5a66a842d550b77916cf2e658e40574c..b88b61f559cc584b5707b7f6e6969d44746ccf6d 100644 (file)
@@ -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
index babe631d5324d01aec918d89f10c62213ec543f4..ed851781c18fbc9180cebcc6288301984a2d4915 100644 (file)
@@ -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
index db118afa6c26a0b998084688847cfe2f7c4d6c30..a4a7547a3827310f5d57bce27d15993bb0c9cd58 100644 (file)
@@ -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:
index aa9d5e981768f9150c7cde48c62ea9bfd8dcef78..b5f2d1b4fc92a41ae0e66e7f484963fa11d7e90d 100644 (file)
@@ -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