--- SOAPpy/Client.py.orig	2005-02-21 14:27:09.000000000 -0600
+++ SOAPpy/Client.py	2013-03-07 17:03:34.505592966 -0600
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 ################################################################################
 #
@@ -43,8 +45,6 @@
 ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $'
 from version import __version__
 
-from __future__ import nested_scopes
-
 #import xml.sax
 import urllib
 from types import *
--- SOAPpy/GSIServer.py.orig	2005-02-15 10:32:22.000000000 -0600
+++ SOAPpy/GSIServer.py	2013-03-07 17:03:53.873769340 -0600
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 GSIServer - Contributed by Ivan R. Judson <judson@mcs.anl.gov>
 
@@ -46,8 +48,6 @@
 ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $'
 from version import __version__
 
-from __future__ import nested_scopes
-
 #import xml.sax
 import re
 import socket
--- SOAPpy/NS.py.orig	2005-02-15 10:32:22.000000000 -0600
+++ SOAPpy/NS.py	2013-03-07 17:04:10.274918735 -0600
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 ################################################################################
 #
@@ -40,8 +42,6 @@
 ################################################################################
 """
 
-from __future__ import nested_scopes
-
 ident = '$Id: NS.py,v 1.4 2005/02/15 16:32:22 warnes Exp $'
 from version import __version__
 
--- SOAPpy/Server.py.orig	2005-02-15 10:32:22.000000000 -0600
+++ SOAPpy/Server.py	2013-03-07 17:04:29.155090633 -0600
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 ################################################################################
 #
@@ -43,8 +45,6 @@
 ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $'
 from version import __version__
 
-from __future__ import nested_scopes
-
 #import xml.sax
 import re
 import socket
--- SOAPpy/Types.py.orig	2005-02-21 22:29:43.000000000 -0600
+++ SOAPpy/Types.py	2013-03-07 17:04:47.938261690 -0600
@@ -1,3 +1,5 @@
+from __future__ import nested_scopes
+
 """
 ################################################################################
 # Copyright (c) 2003, Pfizer
@@ -36,8 +38,6 @@
 ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $'
 from version import __version__
 
-from __future__ import nested_scopes
-
 import UserList
 import base64
 import cgi