From ff0d2d928cd00ba2ed68174de6c71b68775ad6f4 Mon Sep 17 00:00:00 2001 From: nyanye Date: Sat, 19 May 2018 03:40:04 +0900 Subject: [PATCH] Fix python2 & 3 compatibility --- konlpy/csvutils.py | 10 ++++++++-- konlpy/data.py | 11 ++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/konlpy/csvutils.py b/konlpy/csvutils.py index 6ec82ac..7820523 100644 --- a/konlpy/csvutils.py +++ b/konlpy/csvutils.py @@ -1,9 +1,15 @@ -#! /usr/bin/python # -*- coding: utf-8 -*- +from __future__ import absolute_import +import sys import csv import codecs -import cStringIO + +# Python 2 & 3 Compatibility +if sys.version_info[0] >= 3: + from io import StringIO as cStringIO +else: + import cStringIO def _stringify(s, encoding="utf-8"): diff --git a/konlpy/data.py b/konlpy/data.py index 629b5a8..94285b9 100644 --- a/konlpy/data.py +++ b/konlpy/data.py @@ -1,15 +1,16 @@ -#! /usr/bin/python # -*- coding: utf-8 -*- +from __future__ import absolute_import import os import sys import textwrap -try: - import cPickle as pickle -except: + +if sys.version_info[0] >= 3: import pickle +else: + import cPickle as pickle -from . import utils +from konlpy import utils #: A dictionary describing the formats that are supported by