Skip to content

Commit 4a8ca12

Browse files
committed
Apply PR intuit#23
1 parent 058eedf commit 4a8ca12

File tree

4 files changed

+80
-5
lines changed

4 files changed

+80
-5
lines changed

23.patch

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
From 7ddb80911a6511ab4d649271d3f7214e13577e12 Mon Sep 17 00:00:00 2001
2+
From: Alan Yee <alanyee@users.noreply.github.com>
3+
Date: Wed, 30 Sep 2020 15:03:18 -0700
4+
Subject: [PATCH 1/3] Remove future dependency
5+
6+
---
7+
intuitlib/client.py | 6 +++++-
8+
1 file changed, 5 insertions(+), 1 deletion(-)
9+
10+
diff --git a/intuitlib/client.py b/intuitlib/client.py
11+
index fc3ae6a..520b149 100644
12+
--- a/intuitlib/client.py
13+
+++ b/intuitlib/client.py
14+
@@ -15,8 +15,12 @@
15+
from __future__ import absolute_import
16+
17+
import json
18+
+try:
19+
+ from urllib.parse import urlencode
20+
+except ImportError:
21+
+ from urllib import urlencode
22+
+
23+
import requests
24+
-from future.moves.urllib.parse import urlencode
25+
26+
from intuitlib.utils import (
27+
get_discovery_doc,
28+
29+
From bc7ac85140d3caec914b91800f848cc56e40f216 Mon Sep 17 00:00:00 2001
30+
From: Alan Yee <alanyee@users.noreply.github.com>
31+
Date: Wed, 30 Sep 2020 15:03:55 -0700
32+
Subject: [PATCH 2/3] Update setup.py
33+
34+
---
35+
setup.py | 1 -
36+
1 file changed, 1 deletion(-)
37+
38+
diff --git a/setup.py b/setup.py
39+
index 6ffc152..8d030be 100644
40+
--- a/setup.py
41+
+++ b/setup.py
42+
@@ -31,7 +31,6 @@
43+
namespace_packages=('intuitlib',),
44+
install_requires=[
45+
'python_jose>=2.0.2',
46+
- 'future>=0.16.0',
47+
'requests>=2.13.0',
48+
'requests_oauthlib>=1.0.0',
49+
'six>=1.10.0',
50+
51+
From 638064b5030c1033aff0d3dada8c1d2b206f0953 Mon Sep 17 00:00:00 2001
52+
From: Alan Yee <alanyee@users.noreply.github.com>
53+
Date: Wed, 30 Sep 2020 15:12:39 -0700
54+
Subject: [PATCH 3/3] Update requirements.txt
55+
56+
---
57+
requirements.txt | 3 ---
58+
1 file changed, 3 deletions(-)
59+
60+
diff --git a/requirements.txt b/requirements.txt
61+
index 87b7bb0..e0f41ba 100644
62+
--- a/requirements.txt
63+
+++ b/requirements.txt
64+
@@ -1,5 +1,4 @@
65+
python_jose>=2.0.2
66+
-future>=0.16.0
67+
requests>=2.13.0
68+
mock>=2.0.0
69+
requests_oauthlib>=1.0.0
70+
@@ -9,5 +8,3 @@ pytest>=3.8.0
71+
pytest-cov==2.5.0
72+
six>=1.10.0
73+
enum-compat
74+
-
75+
-

intuitlib/client.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@
1515
from __future__ import absolute_import
1616

1717
import json
18+
try:
19+
from urllib.parse import urlencode
20+
except ImportError:
21+
from urllib import urlencode
22+
1823
import requests
19-
from future.moves.urllib.parse import urlencode
2024

2125
from intuitlib.utils import (
2226
get_discovery_doc,

requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
python_jose>=2.0.2
2-
future>=0.16.0
32
requests>=2.13.0
43
mock>=2.0.0
54
requests_oauthlib>=1.0.0
@@ -9,5 +8,3 @@ pytest>=3.8.0
98
pytest-cov==2.5.0
109
six>=1.10.0
1110
enum-compat
12-
13-

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
namespace_packages=('intuitlib',),
3232
install_requires=[
3333
'python_jose>=2.0.2',
34-
'future>=0.16.0',
3534
'requests>=2.13.0',
3635
'requests_oauthlib>=1.0.0',
3736
'six>=1.10.0',

0 commit comments

Comments
 (0)