--- Cheetah-0.9.18-orig/src/NameMapper.py	2008-09-08 12:53:08.000000000 +0000
+++ Cheetah-0.9.18-orig/src/NameMapper.py	2008-09-08 13:07:57.000000000 +0000
@@ -1,6 +1,12 @@ 
 #!/usr/bin/env python
 # $Id: NameMapper.py,v 1.28 2005/01/03 19:05:49 tavis_rudd Exp $
 
+from __future__ import generators
+import types
+from types import StringType, InstanceType, ClassType, TypeType
+from pprint import pformat
+import inspect
+
 """This module supports Cheetah's optional NameMapper syntax.
 
 Overview
@@ -143,12 +149,6 @@ 
              "\nChuck Esterbrook <echuck@mindspring.com>"
 __revision__ = "$Revision: 1.28 $"[11:-2]
 
-from __future__ import generators
-import types
-from types import StringType, InstanceType, ClassType, TypeType
-from pprint import pformat
-import inspect
-
 _INCLUDE_NAMESPACE_REPR_IN_NOTFOUND_EXCEPTIONS = False
 _ALLOW_WRAPPING_OF_NOTFOUND_EXCEPTIONS = True
 __all__ = ['NotFound',
--- Cheetah-0.9.18-orig/src/Tests/NameMapper.py	2008-09-08 12:53:08.000000000 +0000
+++ Cheetah-0.9.18-orig/src/Tests/NameMapper.py	2008-09-08 13:03:27.000000000 +0000
@@ -1,5 +1,12 @@ 
 #!/usr/bin/env python
 # $Id: NameMapper.py,v 1.10 2005/01/03 20:11:13 tavis_rudd Exp $
+
+from __future__ import generators
+import sys
+import types
+import os
+import os.path
+
 """NameMapper Tests
 
 Meta-Data
@@ -12,12 +19,6 @@ 
 __author__ = "Tavis Rudd <tavis@damnsimple.com>"
 __revision__ = "$Revision: 1.10 $"[11:-2]
 
-from __future__ import generators
-import sys
-import types
-import os
-import os.path
-
 import unittest_local_copy as unittest
 from Cheetah.NameMapper import NotFound, valueForKey, \
      valueForName, valueFromSearchList, valueFromFrame, valueFromFrameOrSearchList