Merge pull request #12 from michi88/py3-support

add minimal support for python 3 and 2

.gitignore

@@ -2,4 +2,5 @@
 /dist
 /*.egg-info
 .DS_Store
-*.pyc
+*.pyc
+.python-version

Mollie/API/Client.py

@@ -6,8 +6,8 @@
 
 import requests
 
-import Resource
-from Error import *
+from . import Resource
+from .Error import *
 
 
 class Client:

Mollie/API/Object/Issuer.py

@@ -1,4 +1,4 @@
-from Base import *
+from .Base import *
 
 
 class Issuer(Base):

Mollie/API/Object/List.py

@@ -1,4 +1,4 @@
-from Base import *
+from .Base import *
 
 
 class List(Base):

Mollie/API/Object/Method.py

@@ -1,4 +1,4 @@
-from Base import *
+from .Base import *
 
 
 class Method(Base):

Mollie/API/Object/Payment.py

@@ -1,4 +1,4 @@
-from Base import *
+from .Base import *
 
 
 class Payment(Base):

Mollie/API/Object/__init__.py

@@ -1,5 +1,5 @@
-from Base import *
-from Payment import *
-from Issuer import *
-from Method import *
-from List import *
+from .Base import *
+from .Payment import *
+from .Issuer import *
+from .Method import *
+from .List import *

Mollie/API/Resource/Issuers.py

@@ -1,4 +1,4 @@
-from Base import *
+from .Base import *
 from Mollie.API.Object import Issuer
 
 

Mollie/API/Resource/Methods.py

@@ -1,4 +1,4 @@
-from Base import *
+from .Base import *
 from Mollie.API.Object import Method
 
 

Mollie/API/Resource/Payments.py

@@ -1,4 +1,4 @@
-from Base import *
+from .Base import *
 from Mollie.API.Error import *
 from Mollie.API.Object import Payment, Refund
 

Mollie/API/Resource/__init__.py

@@ -1,4 +1,4 @@
-from Base import *
-from Payments import *
-from Issuers import *
-from Methods import *
+from .Base import *
+from .Payments import *
+from .Issuers import *
+from .Methods import *

Mollie/API/__init__.py

@@ -1,4 +1,4 @@
-from Object import *
-from Resource import *
-from Error import *
-from Client import *
+from .Object import *
+from .Resource import *
+from .Error import *
+from .Client import *

Mollie/__init__.py

@@ -1 +1 @@
-import API
+from . import API

examples/1-new-payment.py

@@ -2,6 +2,8 @@
 #
 # Example 1 - How to prepare a new payment with the Mollie API.
 #
+from __future__ import print_function
+
 import sys, os, time, flask
 from app import database_write
 
@@ -62,4 +64,4 @@ def main():
 
 
 if __name__ == '__main__':
-    print main()
+    print(main())

examples/2-webhook-verification.py

@@ -1,6 +1,8 @@
 #
 # Example 2 - How to verify Mollie API Payments in a webhook.
 #
+from __future__ import print_function
+
 import sys, os, flask
 from app import database_write
 
@@ -63,4 +65,4 @@ def main():
         return 'API call failed: ' + e.message
 
 if __name__ == '__main__':
-    print main()
+    print(main())

examples/3-return-page.py

@@ -4,6 +4,8 @@
 # In this example we retrieve the order stored in the database.
 # Here, it's unnecessary to use the Mollie API Client.
 #
+from __future__ import print_function
+
 import flask
 from app import database_read
 
@@ -21,4 +23,4 @@ def main():
 
 
 if __name__ == '__main__':
-    print main()
+    print(main())

examples/4-ideal-payment.py

@@ -2,6 +2,8 @@
 #
 # Example 4 - How to prepare an iDEAL payment with the Mollie API.
 #
+from __future__ import print_function
+
 import sys, os, time, flask
 from app import database_write
 
@@ -88,4 +90,4 @@ def main ():
 
 
 if __name__ == '__main__':
-    print main()
+    print(main())

examples/5-payments-history.py

@@ -2,6 +2,8 @@
 #
 # Example 5 - How to retrieve your payments history.
 #
+from __future__ import print_function
+
 import sys, os
 
 #
@@ -39,4 +41,4 @@ def main():
         return 'API call failed: ' + e.message
 
 if __name__ == '__main__':
-    print main()
+    print(main())

examples/6-list-activated-methods.py

@@ -2,6 +2,8 @@
 #
 #  Example 6 - How to get the currently activated payment methods.
 #
+from __future__ import print_function
+
 import sys, os
 
 #
@@ -41,4 +43,4 @@ def main():
         return 'API call failed: ' + e.message
 
 if __name__ == '__main__':
-    print main()
+    print(main())

setup.py

@@ -1,13 +1,20 @@
 from setuptools import setup, find_packages
+
 setup(
-    name = 'mollie-api-python',
-    version = '1.0.3',
-    license = 'BSD',
-    packages = find_packages(), 
-    include_package_data = True,
-    description = 'Mollie API client for Python',
-    author = 'Mollie B.V.',
-    author_email = '[email protected]',
-    keywords = ['mollie', 'payment', 'service', 'ideal', 'creditcard', 'mistercash', 'bancontact', 'sofort', 'sofortbanking', 'sepa', 'bitcoin', 'paypal', 'paysafecard', 'podiumcadeaukaart', 'banktransfer', 'direct debit', 'belfius', 'belfius direct net', 'refunds', 'payments', 'gateway'],
-    url = 'https://github.com/mollie/mollie-api-python'
-)
+    name='mollie-api-python',
+    version='1.0.3',
+    license='BSD',
+    packages=find_packages(),
+    include_package_data=True,
+    description='Mollie API client for Python',
+    author='Mollie B.V.',
+    author_email='[email protected]',
+    keywords=['mollie', 'payment', 'service', 'ideal', 'creditcard', 'mistercash', 'bancontact', 'sofort',
+              'sofortbanking', 'sepa', 'bitcoin', 'paypal', 'paysafecard', 'podiumcadeaukaart', 'banktransfer',
+              'direct debit', 'belfius', 'belfius direct net', 'refunds', 'payments', 'gateway'],
+    url='https://github.com/mollie/mollie-api-python',
+    classifiers=[
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+    ]
+)