# HG changeset patch # User Britton Smith # Date 1283537104 14400 # Branch yt # Node ID 17ba6b86d445d59e9882e1d4c6b099ffc2b2e765 # Parent 7cb218c4c65ea44c2ed3086bf61ba5f948d02dfc Moved mylog import to before the first call to mylog. My fault. diff -r 7cb218c4c65ea44c2ed3086bf61ba5f948d02dfc -r 17ba6b86d445d59e9882e1d4c6b099ffc2b2e765 yt/analysis_modules/halo_merger_tree/merger_tree.py --- a/yt/analysis_modules/halo_merger_tree/merger_tree.py Fri Sep 03 13:57:01 2010 -0400 +++ b/yt/analysis_modules/halo_merger_tree/merger_tree.py Fri Sep 03 14:05:04 2010 -0400 @@ -27,10 +27,6 @@ import os, glob, md5, time, gc, sys import h5py import types -try: - import sqlite3 as sql -except ImportError: - mylog.error("sqlite3 not imported!") from yt.funcs import * @@ -49,6 +45,10 @@ ParallelAnalysisInterface, \ parallel_blocking_call +try: + import sqlite3 as sql +except ImportError: + mylog.error("sqlite3 not imported!") column_types = { "GlobalHaloID":"INTEGER",