[Scipy-svn] r6277 - trunk/scipy/cluster

scipy-svn@scip... scipy-svn@scip...
Mon Mar 29 20:56:59 CDT 2010


Author: cdavid
Date: 2010-03-29 20:56:59 -0500 (Mon, 29 Mar 2010)
New Revision: 6277

Modified:
   trunk/scipy/cluster/hierarchy.py
Log:
REF: move types import on top.

Having local and non local imports on the same import statement confuses
2to3.

Modified: trunk/scipy/cluster/hierarchy.py
===================================================================
--- trunk/scipy/cluster/hierarchy.py	2010-03-30 01:56:51 UTC (rev 6276)
+++ trunk/scipy/cluster/hierarchy.py	2010-03-30 01:56:59 UTC (rev 6277)
@@ -193,9 +193,10 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+import types
 
 import numpy as np
-import _hierarchy_wrap, types
+import _hierarchy_wrap
 import scipy.spatial.distance as distance
 
 _cpy_non_euclid_methods = {'single': 0, 'complete': 1, 'average': 2,



More information about the Scipy-svn mailing list