Skip to content

Commit

Permalink
Deprecation of pandas.lib.Timestamp.....I modified the import stateme…
Browse files Browse the repository at this point in the history
…nt to handle both cases :

try:
    from pandas import Timestamp
except ImportError:
    from pandas.lib import Timestamp

Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
  • Loading branch information
ChristianTremblay committed Jun 14, 2017
1 parent 40ef863 commit d2ca271
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion BAC0/core/devices/Points.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
import sqlite3
import pandas as pd
from pandas.io import sql
from pandas.lib import Timestamp
try:
from pandas import Timestamp
except ImportError:
from pandas.lib import Timestamp

#--- this application's modules ---
from ...tasks.Poll import SimplePoll as Poll
Expand Down
5 changes: 4 additions & 1 deletion BAC0/sql/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
import sqlite3
import pandas as pd
from pandas.io import sql
from pandas.lib import Timestamp
try:
from pandas import Timestamp
except ImportError:
from pandas.lib import Timestamp

#--- this application's modules ---

Expand Down

0 comments on commit d2ca271

Please sign in to comment.