Merge branch 'pytables_backwards_compatability' of https://github.com/hhuuggoo/pandas into hhuuggoo-pytables_backwards_compatability

Conflicts:
	doc/source/release.rst

Author: jreback

doc/source/release.rst

@@ -125,6 +125,7 @@ Bug Fixes
 - Bug in take with duplicate columns not consolidated (:issue:`6240`)
 - Bug in interpolate changing dtypes (:issue:`6290`)
 - Bug in Series.get, was using a buggy access method (:issue:`6383`)
+- Bug in hdfstore queries of the form ``where=[('date', '>=', datetime(2013,1,1)), ('date', '<=', datetime(2014,1,1))]`` (:issue:`6313`)
 
 pandas 0.13.1
 -------------

pandas/computation/pytables.py

@@ -488,7 +488,6 @@ def __init__(self, where, op=None, value=None, queryables=None,
         self.filter = None
         self.terms = None
         self._visitor = None
-
         # capture the environement if needed
         lcls = dict()
         if isinstance(where, Expr):
@@ -497,13 +496,12 @@ def __init__(self, where, op=None, value=None, queryables=None,
             where = where.expr
 
         elif isinstance(where, (list, tuple)):
-
-            for w in where:
+            for idx, w in enumerate(where):
                 if isinstance(w, Expr):
                     lcls.update(w.env.locals)
                 else:
                     w = self.parse_back_compat(w)
-
+                    where[idx] = w
             where = ' & ' .join(["(%s)" % w for w in where])
 
         self.expr = where
@@ -528,7 +526,16 @@ def parse_back_compat(self, w, op=None, value=None):
             warnings.warn("passing a dict to Expr is deprecated, "
                           "pass the where as a single string",
                           DeprecationWarning)
-
+        if isinstance(w, tuple):
+            if len(w) == 2:
+                w, value = w
+                op = '=='
+            elif len(w) == 3:
+                w, op, value = w
+            warnings.warn("passing a tuple into Expr is deprecated, "
+                          "pass the where as a single string",
+                          DeprecationWarning)
+                
         if op is not None:
             if not isinstance(w, string_types):
                 raise TypeError(

pandas/io/tests/test_pytables.py

@@ -2474,6 +2474,50 @@ def test_term_compat(self):
             expected = wp.loc[:,:,['A','B']]
             assert_panel_equal(result, expected)
 
+    def test_backwards_compat_without_term_object(self):
+        with ensure_clean_store(self.path) as store:
+
+            wp = Panel(np.random.randn(2, 5, 4), items=['Item1', 'Item2'],
+                       major_axis=date_range('1/1/2000', periods=5),
+                       minor_axis=['A', 'B', 'C', 'D'])
+            store.append('wp',wp)
+            with tm.assert_produces_warning(expected_warning=DeprecationWarning):
+                result = store.select('wp', [('major_axis>20000102'),
+                                             ('minor_axis', '=', ['A','B']) ])
+            expected = wp.loc[:,wp.major_axis>Timestamp('20000102'),['A','B']]
+            assert_panel_equal(result, expected)
+
+            store.remove('wp', ('major_axis>20000103'))
+            result = store.select('wp')
+            expected = wp.loc[:,wp.major_axis<=Timestamp('20000103'),:]
+            assert_panel_equal(result, expected)
+
+        with ensure_clean_store(self.path) as store:
+
+            wp = Panel(np.random.randn(2, 5, 4), items=['Item1', 'Item2'],
+                       major_axis=date_range('1/1/2000', periods=5),
+                       minor_axis=['A', 'B', 'C', 'D'])
+            store.append('wp',wp)
+
+            # stringified datetimes
+            with tm.assert_produces_warning(expected_warning=DeprecationWarning):
+                result = store.select('wp', [('major_axis','>',datetime.datetime(2000,1,2))])
+            expected = wp.loc[:,wp.major_axis>Timestamp('20000102')]
+            assert_panel_equal(result, expected)
+            with tm.assert_produces_warning(expected_warning=DeprecationWarning):
+                result = store.select('wp', [('major_axis','>',datetime.datetime(2000,1,2,0,0))])
+            expected = wp.loc[:,wp.major_axis>Timestamp('20000102')]
+            assert_panel_equal(result, expected)
+            with tm.assert_produces_warning(expected_warning=DeprecationWarning):
+                result = store.select('wp', [('major_axis','=',[datetime.datetime(2000,1,2,0,0),
+                                                                datetime.datetime(2000,1,3,0,0)])])
+            expected = wp.loc[:,[Timestamp('20000102'),Timestamp('20000103')]]
+            assert_panel_equal(result, expected)
+            with tm.assert_produces_warning(expected_warning=DeprecationWarning):
+                result = store.select('wp', [('minor_axis','=',['A','B'])])
+            expected = wp.loc[:,:,['A','B']]
+            assert_panel_equal(result, expected)
+            
     def test_same_name_scoping(self):
 
         with ensure_clean_store(self.path) as store: