diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-05-12 17:26:08 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-05-12 17:26:08 -0400 |
| commit | 176c9615d61f33e061ec0bb6cda35a6e4a1f02d2 (patch) | |
| tree | f30020f476adc8fb1e3279766a632d2cf2123336 /tablib/__init__.py | |
| parent | 2cd381389cb330f57c212eaa2ba233610cf0bbfa (diff) | |
| parent | c65fd4201fa836d13248f294df87e946d327fc59 (diff) | |
| download | tablib-176c9615d61f33e061ec0bb6cda35a6e4a1f02d2.tar.gz | |
Merge branch 'feature/compat' into develop
Conflicts:
tablib/core25.py
Diffstat (limited to 'tablib/__init__.py')
| -rw-r--r-- | tablib/__init__.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tablib/__init__.py b/tablib/__init__.py index dc85527..c7ae7c0 100644 --- a/tablib/__init__.py +++ b/tablib/__init__.py @@ -1,16 +1,8 @@ """ Tablib. """ -import sys -if sys.version_info[0:1] > (2, 5): - from tablib.core import ( - Databook, Dataset, detect, import_set, - InvalidDatasetType, InvalidDimensions, UnsupportedFormat - ) - -else: - from tablib.core25 import ( - Databook, Dataset, detect, import_set, - InvalidDatasetType, InvalidDimensions, UnsupportedFormat - ) +from tablib.core import ( + Databook, Dataset, detect, import_set, + InvalidDatasetType, InvalidDimensions, UnsupportedFormat +) |