Remove future statements. The future is now.

src/ZEO/DebugServer.py

@@ -13,8 +13,6 @@
 ##############################################################################
 """A debugging version of the server that records network activity."""
 
-from __future__ import nested_scopes
-
 import struct
 import time
 

src/ZEO/StorageServer.py

@@ -20,8 +20,6 @@ XXX Need some basic access control-- a declaration of the methods
 exported for invocation by the server.
 """
 
-from __future__ import nested_scopes
-
 import asyncore
 import cPickle
 import os

src/ZEO/start.py

@@ -13,8 +13,6 @@
 ##############################################################################
 """Start the ZEO storage server."""
 
-from __future__ import nested_scopes
-
 import sys, os, getopt
 import types
 import errno

src/ZEO/tests/stress.py

@@ -18,8 +18,6 @@ multiple connections.
 """
 # XXX This code is currently broken.
 
-from __future__ import nested_scopes
-
 import ZODB
 from ZEO.ClientStorage import ClientStorage
 from ZODB.MappingStorage import MappingStorage

src/ZEO/tests/testClientCache.py

@@ -16,8 +16,6 @@
 At times, we do 'white box' testing, i.e. we know about the internals
 of the ClientCache object.
 """
-from __future__ import nested_scopes
-
 import os
 import time
 import tempfile

src/ZODB/Connection.py

@@ -13,9 +13,7 @@
 ##############################################################################
 """Database connection support
 
-$Id: Connection.py,v 1.100 2003/10/02 18:17:19 jeremy Exp $"""
-
-from __future__ import nested_scopes
+$Id: Connection.py,v 1.101 2003/11/03 18:56:30 jeremy Exp $"""
 
 from cPickleCache import PickleCache
 from POSException import ConflictError, ReadConflictError, TransactionError

src/ZODB/tests/TransactionalUndoStorage.py

@@ -15,7 +15,6 @@
 
 Any storage that supports transactionalUndo() must pass these tests.
 """
-from __future__ import nested_scopes
 
 import time
 import types

src/ZODB/tests/TransactionalUndoVersionStorage.py

@@ -11,8 +11,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from __future__ import nested_scopes
-
 # Check interactions between transactionalUndo() and versions.  Any storage
 # that supports both transactionalUndo() and versions must pass these tests.
 

src/ZODB/tests/testCache.py

@@ -17,7 +17,6 @@ Each DB Connection has a separate PickleCache.  The Cache serves two
 purposes. It acts like a memo for unpickling.  It also keeps recent
 objects in memory under the assumption that they may be used again.
 """
-from __future__ import nested_scopes
 
 import time
 import types

src/ZODB/tests/testFileStorage.py

@@ -11,8 +11,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from __future__ import nested_scopes
-
 import ZODB.FileStorage
 import sys, os, unittest
 import errno

src/ZODB/tests/testZODB.py

@@ -11,8 +11,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from __future__ import nested_scopes
-
 import unittest
 
 import ZODB

src/scripts/netspace.py

@@ -7,9 +7,6 @@ usage: netspace.py [-P | -v] data.fs
 -v: print info for all objects, even if a traversal path isn't found
 """
 
-
-from __future__ import nested_scopes
-
 import ZODB
 from ZODB.FileStorage import FileStorage
 from ZODB.utils import U64

src/scripts/repozo.py

@@ -62,8 +62,6 @@ Options for -R/--recover:
         written to stdout.
 """
 
-from __future__ import nested_scopes
-
 import os
 import sys
 import md5

src/scripts/tests/testzeopack.py

-from __future__ import nested_scopes
 # Some simple tests for zeopack.py
 # For this to work, zeopack.py must by on your PATH.