Ticket #5385: 5385_2.patch

twisted/test/test_defgen.py

@@ -1 @@
-from __future__ import generators, nested_scopes
-
 import sys
 
 from twisted.internet import reactor

twisted/python/log.py

@@ -6 +6 @@
 Logging and metrics infrastructure.
 """
 
-from __future__ import division
-
 import sys
 import time
 import warnings

twisted/protocols/ident.py

@@ -8 +8 @@
 @author: Jean-Paul Calderone
 """
 
-from __future__ import generators
-
 import struct
 
 from twisted.internet import defer

twisted/protocols/htb.py

@@ -15 +15 @@
     HOWTO<http://lartc.org/howto/lartc.qdisc.classless.html#AEN682>}
 @author: Kevin Turner
 """
-
-from __future__ import nested_scopes
-
 __version__ = '$Revision: 1.5 $'[11:-2]
 
 

twisted/scripts/tkunzip.py

@@ -6 +6 @@
 Post-install GUI to compile to pyc and unpack twisted doco
 """
 
-from __future__ import generators
-
 import sys
 import zipfile
 import py_compile

twisted/internet/_threadedselect.py

@@ -3 +3 @@
 # Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-from __future__ import generators
-
 """
 Threaded select reactor
 

twisted/conch/scripts/tkconch.py

@@ -8 +8 @@
 """ Implementation module for the `tkconch` command.
 """
 
-from __future__ import nested_scopes
-
 import Tkinter, tkFileDialog, tkFont, tkMessageBox, string
 from twisted.conch.ui import tkvt100
 from twisted.conch.ssh import transport, userauth, connection, common, keys

twisted/words/im/pbsupport.py

@@ -4 +4 @@
 
 """L{twisted.words} support for Instance Messenger."""
 
-from __future__ import nested_scopes
-
 from twisted.internet import defer
 from twisted.internet import error
 from twisted.python import log

twisted/persisted/journal/base.py

@@ -8 +8 @@
 
 """Basic classes and interfaces for journal."""
 
-from __future__ import nested_scopes
-
 # system imports
 import os, time
 

twisted/trial/test/detests.py

@@ -1 @@
-from __future__ import generators
 from twisted.trial import unittest
 from twisted.internet import defer, threads, reactor
 

twisted/spread/ui/gtk2util.py

@@ -2 +2 @@
 # Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-
-from __future__ import nested_scopes
-
 import gtk
 
 from twisted import copyright

doc/core/examples/threadedselect/pygamedemo.py

@@ -1 @@
-from __future__ import generators
-
 # import Twisted and install
 from twisted.internet import _threadedselect
 _threadedselect.install()

doc/core/examples/pbgtk2.py

@@ -1 +1 @@
 # Copyright (c) Twisted Matrix Laboratories.
 # See LICENSE for details.
 
-
-from __future__ import nested_scopes
-
 from twisted.internet import gtk2reactor
 gtk2reactor.install()
 

doc/core/examples/longex2.py

@@ -40 +40 @@
 result is 1. In that, this example departs from doc/examples/longex.py,
 which errors out when trying to do this.
 """
-from __future__ import generators
 from twisted.protocols import basic
 from twisted.internet import defer, protocol
 

doc/conch/examples/window.tac

@@ -4 +4 @@
 # You can run this .tac file directly with:
 #    twistd -ny window.tac
 
-from __future__ import division
-
 import string, random
 
 from twisted.python import log

doc/web/examples/lj.rpy.py

@@ -4 +4 @@
 #
 # Syndicate LiveJournal users
 # Demonstrates how to use chained callbacks
-from __future__ import nested_scopes
 
 from twisted.web import resource as resourcelib
 from twisted.web import client, microdom, domhelpers, server