# HG changeset patch # User Britton Smith # Date 1283536621 14400 # Branch yt # Node ID 7cb218c4c65ea44c2ed3086bf61ba5f948d02dfc # Parent d134c2c665ec091a4af1f69d5843016781a656df Put sqlite3 import inside a try block such that imports from yt.analysis_modules.api don't fail. diff -r d134c2c665ec091a4af1f69d5843016781a656df -r 7cb218c4c65ea44c2ed3086bf61ba5f948d02dfc yt/analysis_modules/halo_merger_tree/merger_tree.py --- a/yt/analysis_modules/halo_merger_tree/merger_tree.py Thu Sep 02 19:41:12 2010 -0700 +++ b/yt/analysis_modules/halo_merger_tree/merger_tree.py Fri Sep 03 13:57:01 2010 -0400 @@ -27,7 +27,11 @@ import os, glob, md5, time, gc, sys import h5py import types -import sqlite3 as sql +try: + import sqlite3 as sql +except ImportError: + mylog.error("sqlite3 not imported!") + from yt.funcs import * from yt.analysis_modules.halo_finding.halo_objects import \ @@ -35,6 +39,7 @@ from yt.analysis_modules.halo_profiler.multi_halo_profiler import \ HaloProfiler from yt.convenience import load +from yt.utilities.logger import ytLogger as mylog try: from yt.utilities.kdtree import * except ImportError: