moar

Author: jreback

pandas/compat/__init__.py

@@ -381,27 +381,32 @@ def raise_with_traceback(exc, traceback=Ellipsis):
 # http://stackoverflow.com/questions/4126348
 # Thanks to @martineau at SO
 
+# dateutil compat across versions
+
 import dateutil
 
 if PY2 and LooseVersion(dateutil.__version__) == '2.0':
     # dateutil brokenness
     raise Exception("dateutil 2.0 incompatible with Python 2.x, "
                     "you must install version 1.5 or 2.1+!")
+elif LooseVersion(dateutil.__version__) < '2.0':
 
-try:
+    from dateutil import parser as _date_parser
+
+    @functools.wraps(_date_parser.parse)
+    def parse_date(timestr, *args, **kwargs):
+        timestr = bytes(timestr)
+        return _date_parser.parse(timestr, *args, **kwargs)
+
+elif LooseVersion(dateutil.__version__) <= '2.6.1':
 
     from dateutil import parser as _date_parser
-    if LooseVersion(dateutil.__version__) < '2.0':
+    parse_date = _date_parser.parse
+
+else:
+
+    from dateutil.parsers import parser as _date_parser
 
-        @functools.wraps(_date_parser.parse)
-        def parse_date(timestr, *args, **kwargs):
-            timestr = bytes(timestr)
-            return _date_parser.parse(timestr, *args, **kwargs)
-    else:
-        parse_date = _date_parser.parse
-except Exception as e:
-    print(e)
-    raise
 
 
 # https://github.com/pandas-dev/pandas/pull/9123