Master depends on 2.6, hence no "future with_statement"

buildbot · Jun 23, 2015 · fcb70bf · fcb70bf
1 parent ab3669f
commit fcb70bf
Show file tree

Hide file tree

Showing 44 changed files with 7 additions and 141 deletions.
diff --git a/master/buildbot/__init__.py b/master/buildbot/__init__.py
@@ -17,7 +17,6 @@
 #
 # We can't put this method in utility modules, because they import dependancy packages
 #
-from __future__ import with_statement
 from subprocess import Popen, PIPE, STDOUT
 import os
 import re

diff --git a/master/buildbot/buildslave/ec2.py b/master/buildbot/buildslave/ec2.py
@@ -12,11 +12,9 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Portions Copyright Buildbot Team Members
-
-from __future__ import with_statement
 # Portions Copyright Canonical Ltd. 2009
-
-"""A LatentSlave that uses EC2 to instantiate the slaves on demand.
+"""
+A LatentSlave that uses EC2 to instantiate the slaves on demand.
 
 Tested with Python boto 1.5c
 """

diff --git a/master/buildbot/changes/changes.py b/master/buildbot/changes/changes.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import time
 
 from buildbot.util import datetime2epoch

diff --git a/master/buildbot/changes/svnpoller.py b/master/buildbot/changes/svnpoller.py
@@ -12,14 +12,9 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
-
 # Based on the work of Dave Peticolas for the P4poll
 # Changed to svn (using xml.dom.minidom) by Niklaus Giger
 # Hacked beyond recognition by Brian Warner
-
 from twisted.internet import defer
 from twisted.internet import utils
 from twisted.python import log

diff --git a/master/buildbot/clients/tryclient.py b/master/buildbot/clients/tryclient.py
@@ -12,10 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
-
 import os
 import random
 import re

diff --git a/master/buildbot/config.py b/master/buildbot/config.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import re
 import sys

diff --git a/master/buildbot/db/migrate/versions/001_initial.py b/master/buildbot/db/migrate/versions/001_initial.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import sqlalchemy as sa
 

diff --git a/master/buildbot/manhole.py b/master/buildbot/manhole.py
@@ -12,10 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
-
 import base64
 import binascii
 import os

diff --git a/master/buildbot/process/metrics.py b/master/buildbot/process/metrics.py
@@ -12,8 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
 r"""
 Buildbot metrics module
 

diff --git a/master/buildbot/scripts/base.py b/master/buildbot/scripts/base.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import copy
 import os
 import stat

diff --git a/master/buildbot/scripts/create_master.py b/master/buildbot/scripts/create_master.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import jinja2
 import os
 

diff --git a/master/buildbot/scripts/reconfig.py b/master/buildbot/scripts/reconfig.py
@@ -12,10 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
-
 import os
 import platform
 import signal

diff --git a/master/buildbot/scripts/restart.py b/master/buildbot/scripts/restart.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 from buildbot.scripts import base
 from buildbot.scripts import start
 from buildbot.scripts import stop

diff --git a/master/buildbot/scripts/runner.py b/master/buildbot/scripts/runner.py
@@ -12,15 +12,12 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
+#
 # N.B.: don't import anything that might pull in a reactor yet. Some of our
 # subcommands want to load modules that need the gtk reactor.
 #
 # Also don't forget to mirror your changes on command-line options in manual
 # pages and texinfo documentation.
-
 import sqlalchemy as sa
 import sys
 

diff --git a/master/buildbot/scripts/stop.py b/master/buildbot/scripts/stop.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import errno
 import os
 import signal

diff --git a/master/buildbot/scripts/tryserver.py b/master/buildbot/scripts/tryserver.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import sys
 import time

diff --git a/master/buildbot/scripts/upgrade_master.py b/master/buildbot/scripts/upgrade_master.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import sys
 import traceback

diff --git a/master/buildbot/status/build.py b/master/buildbot/status/build.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import re
 import shutil

diff --git a/master/buildbot/status/builder.py b/master/buildbot/status/builder.py
@@ -12,10 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
-
 import itertools
 import os
 import re

diff --git a/master/buildbot/status/master.py b/master/buildbot/status/master.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import urllib
 

diff --git a/master/buildbot/status/persistent_queue.py b/master/buildbot/status/persistent_queue.py
@@ -12,10 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
-
 import os
 
 from buildbot.util import pickle

diff --git a/master/buildbot/status/status_push.py b/master/buildbot/status/status_push.py
@@ -12,13 +12,11 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
+"""
+Push events to an abstract receiver.
 
-from __future__ import with_statement
-
-
-"""Push events to an abstract receiver.
-
-Implements the HTTP receiver."""
+Implements the HTTP receiver.
+"""
 
 import datetime
 import os

diff --git a/master/buildbot/steps/package/rpm/rpmbuild.py b/master/buildbot/steps/package/rpm/rpmbuild.py
@@ -14,9 +14,6 @@
 # Portions Copyright Buildbot Team Members
 # Portions Copyright Dan Radez <dradez+buildbot@redhat.com>
 # Portions Copyright Steve 'Ashcrow' Milner <smilner+buildbot@redhat.com>
-
-from __future__ import with_statement
-
 import os
 
 from buildbot import config

diff --git a/master/buildbot/test/integration/test_configs.py b/master/buildbot/test/integration/test_configs.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 
 from buildbot import config

diff --git a/master/buildbot/test/integration/test_upgrade.py b/master/buildbot/test/integration/test_upgrade.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import migrate
 import migrate.versioning.api
 import os

diff --git a/master/buildbot/test/unit/test_changes_mail.py b/master/buildbot/test/unit/test_changes_mail.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 
 from buildbot.changes import mail

diff --git a/master/buildbot/test/unit/test_changes_svnpoller.py b/master/buildbot/test/unit/test_changes_svnpoller.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import xml.dom.minidom
 

diff --git a/master/buildbot/test/unit/test_clients_tryclient.py b/master/buildbot/test/unit/test_clients_tryclient.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 from twisted.trial import unittest
 
 from buildbot.clients import tryclient

diff --git a/master/buildbot/test/unit/test_config.py b/master/buildbot/test/unit/test_config.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import __builtin__
 import mock
 import os

diff --git a/master/buildbot/test/unit/test_schedulers_trysched.py b/master/buildbot/test/unit/test_schedulers_trysched.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import cStringIO as StringIO
 import mock
 import os

diff --git a/master/buildbot/test/unit/test_scripts_base.py b/master/buildbot/test/unit/test_scripts_base.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import cStringIO
 import os
 import string

diff --git a/master/buildbot/test/unit/test_scripts_checkconfig.py b/master/buildbot/test/unit/test_scripts_checkconfig.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import cStringIO
 import mock
 import os

diff --git a/master/buildbot/test/unit/test_scripts_create_master.py b/master/buildbot/test/unit/test_scripts_create_master.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import mock
 import os
 

diff --git a/master/buildbot/test/unit/test_scripts_restart.py b/master/buildbot/test/unit/test_scripts_restart.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 
 from buildbot.scripts import restart

diff --git a/master/buildbot/test/unit/test_scripts_runner.py b/master/buildbot/test/unit/test_scripts_runner.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import cStringIO
 import getpass
 import mock

diff --git a/master/buildbot/test/unit/test_scripts_start.py b/master/buildbot/test/unit/test_scripts_start.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import sys
 import time

diff --git a/master/buildbot/test/unit/test_scripts_stop.py b/master/buildbot/test/unit/test_scripts_stop.py
@@ -12,9 +12,6 @@
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Copyright Buildbot Team Members
-
-from __future__ import with_statement
-
 import os
 import signal
 import time