Merge branch 'el6' into epel7
This commit is contained in:
commit
3fedd905d9
1 changed files with 4 additions and 5 deletions
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/vertica_python/vertica/column.py b/vertica_python/vertica/column.py
|
||||
index 75d87a2..9eeef08 100644
|
||||
index cc0bb27..3266d74 100644
|
||||
--- a/vertica_python/vertica/column.py
|
||||
+++ b/vertica_python/vertica/column.py
|
||||
@@ -5,6 +5,11 @@ from collections import namedtuple
|
||||
|
|
@ -8,9 +8,8 @@ index 75d87a2..9eeef08 100644
|
|||
from datetime import datetime
|
||||
+from pkg_resources import require,VersionConflict
|
||||
+try:
|
||||
+ require("python_dateutil>=1.5")
|
||||
+ require("python_dateutil>=1.5")
|
||||
+except VersionConflict:
|
||||
+ pass
|
||||
+ pass
|
||||
from dateutil import parser
|
||||
|
||||
import pytz
|
||||
from vertica_python import errors
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue