From 12b70aaa341fbee3b662cf0ce8ff9142e44f0226 Mon Sep 17 00:00:00 2001
From: Ali Ebrahim <aebrahim@ucsd.edu>
Date: Thu, 22 Oct 2015 12:58:13 -0700
Subject: [PATCH] import from traitlets directly instead of IPYthon

This prevents the shim warnings from being raised.
---
 src/sql/magic.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/sql/magic.py b/src/sql/magic.py
index 4e30fa51f..60a160ed4 100644
--- a/src/sql/magic.py
+++ b/src/sql/magic.py
@@ -1,7 +1,11 @@
 import re
 from IPython.core.magic import Magics, magics_class, cell_magic, line_magic, needs_local_scope
-from IPython.config.configurable import Configurable
-from IPython.utils.traitlets import Bool, Int, Unicode
+try:
+    from traitlets.config.configurable import Configurable
+    from traitlets import Bool, Int, Unicode
+except ImportError:
+    from IPython.config.configurable import Configurable
+    from IPython.utils.traitlets import Bool, Int, Unicode
 try:
     from pandas.core.frame import DataFrame, Series
 except ImportError: