Skip to content

Fix python3 incompatibility issues #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aleehedl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix python3 incompatibility issues #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion checkout/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import hmac
import json
import requests
import sys
import xml.etree.ElementTree as ET

class CheckoutException(Exception):
Expand Down Expand Up @@ -260,6 +261,8 @@ def _calculate_payment_md5(self, params, merchant_secret):
params["ADDRESS"], params["POSTCODE"], params["POSTOFFICE"], merchant_secret]

base = '+'.join(fields)
if sys.version_info >= (3, 0, 0):
base = base.encode('utf-8')
return hashlib.md5(base).hexdigest().upper()

def validate_payment_return(self, mac, version, order_number, order_reference, payment, status, algorithm):
Expand All @@ -286,4 +289,8 @@ def validate_payment_return(self, mac, version, order_number, order_reference, p
"""
fields = [version, order_number, order_reference, payment, status, algorithm]
base = '&'.join(fields)
return mac == hmac.new(self.merchant_secret, base, hashlib.sha256).hexdigest().upper()
ms = self.merchant_secret
if sys.version_info >= (3, 0, 0):
base = base.encode('utf-8')
ms = ms.encode('utf-8')
return mac == hmac.new(ms, base, hashlib.sha256).hexdigest().upper()