From 21c481fa5445e3dc9713068de2dd2ee2595b84dc Mon Sep 17 00:00:00 2001 From: Ronan Delacroix Date: Tue, 7 Oct 2014 17:27:26 +0200 Subject: [PATCH 1/3] Fixed Import Error in setup.py for Python 3 support --- klv/__init__.py | 4 +--- setup.py | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/klv/__init__.py b/klv/__init__.py index c9be3f9..bb27801 100644 --- a/klv/__init__.py +++ b/klv/__init__.py @@ -1,6 +1,4 @@ -__version__ = '0.0.2' - from klv import decode_ber from klv import encode_ber from klv import encode -from klv import decode \ No newline at end of file +from klv import decode diff --git a/setup.py b/setup.py index 2e08b1e..3808901 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,8 @@ -from distutils.core import setup -from klv import __version__ +from setuptools import setup setup( name='klv', - version=__version__, + version='0.0.2', license='MIT', description='Key Length Value encoding and decoding', author='Arts Alliance Media', @@ -17,4 +16,4 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', ) -) \ No newline at end of file +) From 83f5d502b326d34f71def915a656b58ebac024e6 Mon Sep 17 00:00:00 2001 From: Ronan Delacroix Date: Tue, 7 Oct 2014 17:30:53 +0200 Subject: [PATCH 2/3] Import error in Python 3 --- klv/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/klv/__init__.py b/klv/__init__.py index bb27801..bf5ef34 100644 --- a/klv/__init__.py +++ b/klv/__init__.py @@ -1,4 +1,4 @@ -from klv import decode_ber -from klv import encode_ber -from klv import encode -from klv import decode +from .klv import decode_ber +from .klv import encode_ber +from .klv import encode +from .klv import decode From a2aa19abd98a2809dbeb4a043b971575b96486d1 Mon Sep 17 00:00:00 2001 From: Ronan Delacroix Date: Tue, 7 Oct 2014 17:33:00 +0200 Subject: [PATCH 3/3] Version bump for pip support --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3808901..bda9033 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='klv', - version='0.0.2', + version='0.0.3', license='MIT', description='Key Length Value encoding and decoding', author='Arts Alliance Media',