diff --git a/discount/__init__.py b/discount/__init__.py index 2650dda..dd1fed7 100644 --- a/discount/__init__.py +++ b/discount/__init__.py @@ -23,7 +23,7 @@ import ctypes -import libmarkdown +from discount import libmarkdown _KWARGS_TO_LIBMARKDOWN_FLAGS = { diff --git a/discount/libmarkdown.py b/discount/libmarkdown.py index 19df766..a877060 100644 --- a/discount/libmarkdown.py +++ b/discount/libmarkdown.py @@ -24,7 +24,7 @@ import ctypes import os - +import sys MKD_NOLINKS = 0x0001 MKD_NOIMAGE = 0x0002 @@ -55,10 +55,9 @@ class FILE(ctypes.Structure): pass - -ctypes.pythonapi.PyFile_AsFile.argtypes = (ctypes.py_object,) - -ctypes.pythonapi.PyFile_AsFile.restype = ctypes.POINTER(FILE) +if sys.version_info[0] == 2: + ctypes.pythonapi.PyFile_AsFile.argtypes = (ctypes.py_object,) + ctypes.pythonapi.PyFile_AsFile.restype = ctypes.POINTER(FILE) class Cstring(ctypes.Structure): diff --git a/setup.py b/setup.py index 93311bd..6f4ca82 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,14 @@ +from __future__ import absolute_import, print_function + import os import posixpath import shutil import subprocess -import urllib2 + +try: + import urllib2 +except ImportError: + import urllib.request as urllib2 from distutils.command.build_ext import build_ext as _build_ext from distutils.core import setup, Extension @@ -71,14 +77,14 @@ def build_extension(self, ext): os.makedirs(self.build_temp) if not os.path.exists(filepath): - print 'Downloading %s...' % self.discount_download_url + print('Downloading %s...' % self.discount_download_url) data = urllib2.urlopen(self.discount_download_url) fp = open(filepath, 'wb') fp.write(data.read()) fp.close() - print 'Extracting %s...' % filepath + print('Extracting %s...' % filepath) subprocess.call( ['tar', 'xzf', filepath, '-C', self.build_temp]