From 3bd287e577bb0c8a10a97e01793a6d30ce786da6 Mon Sep 17 00:00:00 2001 From: Joe Black Date: Wed, 7 Mar 2018 18:42:22 -0500 Subject: [PATCH] switched to MIT license --- LICENSE | 27 ++++++++++++++++----------- btcpay.egg-info/PKG-INFO | 5 +++-- btcpay.egg-info/requires.txt | 2 +- build/lib/btcpay/client.py | 15 ++++++++++++--- dist/btcpay-1.0.1-py3-none-any.whl | Bin 0 -> 4818 bytes dist/btcpay-1.0.1.tar.gz | Bin 0 -> 3570 bytes setup.py | 8 ++++---- 7 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 dist/btcpay-1.0.1-py3-none-any.whl create mode 100644 dist/btcpay-1.0.1.tar.gz diff --git a/LICENSE b/LICENSE index b2f9c4f..4f66848 100644 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,19 @@ +Copyright 2017 Joe Black -Copyright 2017 Jose Black + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/btcpay.egg-info/PKG-INFO b/btcpay.egg-info/PKG-INFO index 310e414..44d3cea 100644 --- a/btcpay.egg-info/PKG-INFO +++ b/btcpay.egg-info/PKG-INFO @@ -1,12 +1,13 @@ Metadata-Version: 1.1 Name: btcpay -Version: 1.0.0 +Version: 1.0.1 Summary: Accept bitcoin with BTCPay Home-page: https://github.com/joeblackwaslike/btcpay-python Author: Joe Black Author-email: me@joeblack.nyc License: Apache 2.0 -Download-URL: https://github.com/joeblackwaslike/btcpay-python/tarball/v1.0.0 +Download-URL: https://github.com/joeblackwaslike/btcpay-python/tarball/v1.0.1 +Description-Content-Type: UNKNOWN Description: UNKNOWN Keywords: bitcoin,payments,crypto Platform: UNKNOWN diff --git a/btcpay.egg-info/requires.txt b/btcpay.egg-info/requires.txt index 0fee4fc..517a4bd 100644 --- a/btcpay.egg-info/requires.txt +++ b/btcpay.egg-info/requires.txt @@ -1,2 +1,2 @@ -ecdsa requests +ecdsa diff --git a/build/lib/btcpay/client.py b/build/lib/btcpay/client.py index 7af33ac..c697e47 100644 --- a/build/lib/btcpay/client.py +++ b/build/lib/btcpay/client.py @@ -55,9 +55,9 @@ class BTCPayClient: uri = self.host + path if payload: payload = json.dumps(payload) - r = self.s.post(uri, headers=headers, data=payload) + r = self.s.post(uri, data=payload) else: - r = self.s.get(uri, headers=headers) + r = self.s.get(uri) r.raise_for_status() return r.json()['data'] @@ -85,10 +85,19 @@ class BTCPayClient: if re.match(r'^\w{7,7}$', code) is None: raise ValueError("pairing code is not legal") payload = {'id': self.client_id, 'pairingCode': code} - return self._unsigned_request('/tokens', payload) + data = self._unsigned_request('/tokens', payload) + data = data[0] + return { + data['facade']: data['token'] + } def __repr__(self): return '{}({})'.format( type(self).__name__, self.host ) + +# from btcpay import BTCPayClient +client = BTCPayClient(host=shop.gateway.client.uri, insecure=True, pem=shop.gateway.client.pem, tokens=shop.gateway.client.tokens) + +client = BTCPayClient(host=shop.gateway.client.uri, insecure=True, pem=shop.gateway.client.pem, tokens={'merchant': 'ET9rzVZUJLg9xnWo7pcjw32fPnqLj7KocfP3XyDptrCo'}) diff --git a/dist/btcpay-1.0.1-py3-none-any.whl b/dist/btcpay-1.0.1-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..efb6e52057a19ed46b7f24cf8d9a0db00f9167a3 GIT binary patch literal 4818 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 literal 0 HcmV?d00001 diff --git a/dist/btcpay-1.0.1.tar.gz b/dist/btcpay-1.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..70bf72cf6f8c1813c842184a57a170b959948a43 GIT binary patch literal 3570 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 literal 0 HcmV?d00001 diff --git a/setup.py b/setup.py index c0cb66c..d16efb7 100644 --- a/setup.py +++ b/setup.py @@ -4,13 +4,13 @@ from setuptools import setup, find_packages setup( name="btcpay", packages=find_packages(), - version="1.0.1", + version="1.0.2", description="Accept bitcoin with BTCPay", author="Joe Black", author_email="me@joeblack.nyc", url="https://github.com/joeblackwaslike/btcpay-python", - download_url="https://github.com/joeblackwaslike/btcpay-python/tarball/v1.0.1", - license='Apache 2.0', + download_url="https://github.com/joeblackwaslike/btcpay-python/tarball/v1.0.2", + license='MIT', keywords=["bitcoin", "payments", "crypto"], install_requires=[ "requests", @@ -24,7 +24,7 @@ setup( "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", + "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Office/Business :: Financial"