diff options
| -rw-r--r-- | tablib/formats/_html.py | 8 | ||||
| -rw-r--r-- | tablib/formats/_yaml.py | 8 | ||||
| -rwxr-xr-x | test_tablib.py | 8 |
3 files changed, 21 insertions, 3 deletions
diff --git a/tablib/formats/_html.py b/tablib/formats/_html.py index d3a7459..bfa3b5c 100644 --- a/tablib/formats/_html.py +++ b/tablib/formats/_html.py @@ -3,9 +3,15 @@ """ Tablib - HTML export support. """ +import sys from io import StringIO -from tablib.packages import markup + +if sys.version_info.major > 2: + from tablib.packages import markup3 as markup +else: + from tablib.packages import markup + import tablib BOOK_ENDINGS = 'h3' diff --git a/tablib/formats/_yaml.py b/tablib/formats/_yaml.py index 3f2f8b7..0124c94 100644 --- a/tablib/formats/_yaml.py +++ b/tablib/formats/_yaml.py @@ -3,10 +3,16 @@ """ Tablib - YAML Support. """ +import sys + try: import yaml except ImportError: - import tablib.packages.yaml as yaml + if sys.version_info.major > 2: + import tablib.packages.yaml3 as yaml + else: + import tablib.packages.yaml as yaml + import tablib diff --git a/test_tablib.py b/test_tablib.py index 568d3d8..5c4c551 100755 --- a/test_tablib.py +++ b/test_tablib.py @@ -4,8 +4,14 @@ """Tests for Tablib.""" import unittest +import sys + +if sys.version_info.major > 2: + from tablib.packages import markup3 as markup +else: + from tablib.packages import markup + -from tablib.packages import markup import tablib |