From 20a8fea263290d4607ca4e2181d44a71234086f1 Mon Sep 17 00:00:00 2001
From: Paige Rossi <Paige.Rossi@dsa026975.docusignhq.com>
Date: Wed, 2 Sep 2020 13:37:18 -0700
Subject: [PATCH 1/3] updates to fix error from DEVDOCS-#3091

---
 app/eg001_embedded_signing.py           |  2 +-
 app/eg002_signing_via_email.py          |  2 +-
 app/eg003_list_envelopes.py             |  2 +-
 app/eg004_envelope_info.py              |  2 +-
 app/eg005_envelope_recipients.py        |  2 +-
 app/eg006_envelope_docs.py              |  2 +-
 app/eg007_envelope_get_doc.py           |  2 +-
 app/eg008_create_template.py            |  2 +-
 app/eg009_use_template.py               |  2 +-
 app/eg011_embedded_sending.py           |  2 +-
 app/eg012_embedded_console.py           |  2 +-
 app/eg013_add_doc_to_template.py        |  2 +-
 app/eg014_collect_payment.py            |  2 +-
 app/eg015_envelope_tab_data.py          |  2 +-
 app/eg016_set_tab_values.py             |  2 +-
 app/eg017_set_template_tab_values.py    |  2 +-
 app/eg018_envelope_custom_field_data.py |  2 +-
 app/eg019_access_code_authentication.py |  2 +-
 app/eg020_sms_authentication.py         |  2 +-
 app/eg021_phone_authentication.py       |  2 +-
 app/eg022_kba_authentication.py         |  2 +-
 requirements.txt                        | 54 ++++++++++++-------------
 22 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/app/eg001_embedded_signing.py b/app/eg001_embedded_signing.py
index 6a564cb4..0f916b4c 100644
--- a/app/eg001_embedded_signing.py
+++ b/app/eg001_embedded_signing.py
@@ -7,7 +7,7 @@
 import base64
 import re
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg001"  # reference (and url) for this example
 signer_client_id = 1000 # Used to indicate that the signer will use an embedded
diff --git a/app/eg002_signing_via_email.py b/app/eg002_signing_via_email.py
index bc607277..71c9652e 100644
--- a/app/eg002_signing_via_email.py
+++ b/app/eg002_signing_via_email.py
@@ -7,7 +7,7 @@
 import re
 import json
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg002"  # reference (and url) for this example
 demo_docs_path = path.abspath(path.join(path.dirname(path.realpath(__file__)), "static/demo_documents"))
diff --git a/app/eg003_list_envelopes.py b/app/eg003_list_envelopes.py
index 9c45591c..16f91f2e 100644
--- a/app/eg003_list_envelopes.py
+++ b/app/eg003_list_envelopes.py
@@ -6,7 +6,7 @@
 from app import app, ds_config, views
 from datetime import datetime, timedelta
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg003"  # reference (and url) for this example
 
diff --git a/app/eg004_envelope_info.py b/app/eg004_envelope_info.py
index 0ef07073..34631149 100644
--- a/app/eg004_envelope_info.py
+++ b/app/eg004_envelope_info.py
@@ -5,7 +5,7 @@
 import json
 from app import app, ds_config, views
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg004"  # reference (and url) for this example
 
diff --git a/app/eg005_envelope_recipients.py b/app/eg005_envelope_recipients.py
index 7a19f5d3..28421427 100644
--- a/app/eg005_envelope_recipients.py
+++ b/app/eg005_envelope_recipients.py
@@ -5,7 +5,7 @@
 import json
 from app import ds_config, views
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg005"  # reference (and url) for this example
 
diff --git a/app/eg006_envelope_docs.py b/app/eg006_envelope_docs.py
index 81c757b8..2ef32935 100644
--- a/app/eg006_envelope_docs.py
+++ b/app/eg006_envelope_docs.py
@@ -5,7 +5,7 @@
 import json
 from app import app, ds_config, views
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg006"  # reference (and url) for this example
 
diff --git a/app/eg007_envelope_get_doc.py b/app/eg007_envelope_get_doc.py
index 5d19a744..ea28a01f 100644
--- a/app/eg007_envelope_get_doc.py
+++ b/app/eg007_envelope_get_doc.py
@@ -7,7 +7,7 @@
 import io
 from app import app, ds_config, views
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg007"  # reference (and url) for this example
 
diff --git a/app/eg008_create_template.py b/app/eg008_create_template.py
index 310d693b..26e9a72d 100644
--- a/app/eg008_create_template.py
+++ b/app/eg008_create_template.py
@@ -7,7 +7,7 @@
 import re
 import json
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg008"  # reference (and url) for this example
 demo_docs_path = path.abspath(path.join(path.dirname(path.realpath(__file__)), 'static/demo_documents'))
diff --git a/app/eg009_use_template.py b/app/eg009_use_template.py
index 4c42c751..7d35d986 100644
--- a/app/eg009_use_template.py
+++ b/app/eg009_use_template.py
@@ -7,7 +7,7 @@
 import base64
 import re
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg009"  # reference (and url) for this example
 
diff --git a/app/eg011_embedded_sending.py b/app/eg011_embedded_sending.py
index 8b1f777d..0ff12292 100644
--- a/app/eg011_embedded_sending.py
+++ b/app/eg011_embedded_sending.py
@@ -6,7 +6,7 @@
 import re
 from app import app, ds_config, views, eg002_signing_via_email
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg011"  # reference (and url) for this example
 
diff --git a/app/eg012_embedded_console.py b/app/eg012_embedded_console.py
index 77eb2011..28c411b5 100644
--- a/app/eg012_embedded_console.py
+++ b/app/eg012_embedded_console.py
@@ -6,7 +6,7 @@
 import re
 from app import ds_config, views
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg012"  # reference (and url) for this example
 
diff --git a/app/eg013_add_doc_to_template.py b/app/eg013_add_doc_to_template.py
index 7af5b8e1..b2c36fe8 100644
--- a/app/eg013_add_doc_to_template.py
+++ b/app/eg013_add_doc_to_template.py
@@ -7,7 +7,7 @@
 import base64
 import re
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg013"  # reference (and url) for this example
 signer_client_id = 1000 # The id of the signer within this application.
diff --git a/app/eg014_collect_payment.py b/app/eg014_collect_payment.py
index 2fe0481e..46caa0f0 100644
--- a/app/eg014_collect_payment.py
+++ b/app/eg014_collect_payment.py
@@ -7,7 +7,7 @@
 import re
 import json
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg014"  # reference (and url) for this example
 demo_docs_path = path.abspath(path.join(path.dirname(path.realpath(__file__)), "static/demo_documents"))
diff --git a/app/eg015_envelope_tab_data.py b/app/eg015_envelope_tab_data.py
index 76af1de0..9941cc78 100644
--- a/app/eg015_envelope_tab_data.py
+++ b/app/eg015_envelope_tab_data.py
@@ -5,7 +5,7 @@
 import json
 from app import app, ds_config, views
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg015"  # Reference (and URL) for this example
 
diff --git a/app/eg016_set_tab_values.py b/app/eg016_set_tab_values.py
index d168575d..13260e4b 100644
--- a/app/eg016_set_tab_values.py
+++ b/app/eg016_set_tab_values.py
@@ -7,7 +7,7 @@
 import base64
 import re
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg016"  # Reference (and URL) for this example
 signer_client_id = 1000 # Used to indicate that the signer will use an embedded
diff --git a/app/eg017_set_template_tab_values.py b/app/eg017_set_template_tab_values.py
index ecd8bb29..e18f8dbe 100644
--- a/app/eg017_set_template_tab_values.py
+++ b/app/eg017_set_template_tab_values.py
@@ -7,7 +7,7 @@
 import base64
 import re
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg017"  # reference (and url) for this example
 signer_client_id = 1000 # Used to indicate that the signer will use an embedded
diff --git a/app/eg018_envelope_custom_field_data.py b/app/eg018_envelope_custom_field_data.py
index 4b1aad55..278f0b93 100644
--- a/app/eg018_envelope_custom_field_data.py
+++ b/app/eg018_envelope_custom_field_data.py
@@ -5,7 +5,7 @@
 import json
 from app import app, ds_config, views
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg018"  # reference (and URL) for this example
 
diff --git a/app/eg019_access_code_authentication.py b/app/eg019_access_code_authentication.py
index 71483aeb..0efed8a5 100644
--- a/app/eg019_access_code_authentication.py
+++ b/app/eg019_access_code_authentication.py
@@ -7,7 +7,7 @@
 import re
 import json
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg019"  # reference (and url) for this example
 # access_code = "NJ9@D1"
diff --git a/app/eg020_sms_authentication.py b/app/eg020_sms_authentication.py
index bd0d24da..cf452f3d 100644
--- a/app/eg020_sms_authentication.py
+++ b/app/eg020_sms_authentication.py
@@ -7,7 +7,7 @@
 import re
 import json
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg020"  # reference (and url) for this example
 demo_docs_path = path.abspath(path.join(path.dirname(path.realpath(__file__)), "static/demo_documents"))
diff --git a/app/eg021_phone_authentication.py b/app/eg021_phone_authentication.py
index e25c7690..b05aea93 100644
--- a/app/eg021_phone_authentication.py
+++ b/app/eg021_phone_authentication.py
@@ -7,7 +7,7 @@
 import re
 import json
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg021"  # reference (and url) for this example
 demo_docs_path = path.abspath(path.join(path.dirname(path.realpath(__file__)), "static/demo_documents"))
diff --git a/app/eg022_kba_authentication.py b/app/eg022_kba_authentication.py
index 247db5b0..8e1f602d 100644
--- a/app/eg022_kba_authentication.py
+++ b/app/eg022_kba_authentication.py
@@ -7,7 +7,7 @@
 import re
 import json
 from docusign_esign import *
-from docusign_esign.rest import ApiException
+from docusign_esign import ApiException
 
 eg = "eg022"  # reference (and url) for this example
 demo_docs_path = path.abspath(path.join(path.dirname(path.realpath(__file__)), "static/demo_documents"))
diff --git a/requirements.txt b/requirements.txt
index 1a189e08..10d80625 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,35 +1,31 @@
-asn1crypto==0.24.0
-astroid==2.0.4
-certifi==2018.4.16
-cffi==1.11.5
+astroid==2.3.3
+certifi==2019.9.11
+cffi==1.13.2
 chardet==3.0.4
 Click==7.0
-cryptography==2.7
-docusign-esign==1.0.3
-Flask==1.0.2
+cryptography==2.8
+docusign-esign==3.1.0rc2
+Flask==1.1.1
 Flask-OAuthlib==0.9.5
-flask-wtf==0.14.2
-idna==2.7
-isort==4.3.4
-itsdangerous==0.24
-Jinja2>=2.10.1
-jwcrypto==0.5.0
-lazy-object-proxy==1.3.1
-MarkupSafe==1.0
+flask-wtf==0.14.3
+idna==2.8
+isort==4.3.21
+itsdangerous==1.1.0
+Jinja2>=2.10.3
+lazy-object-proxy==1.4.3
+MarkupSafe==1.1.1
 mccabe==0.6.1
 oauthlib==2.1.0
-pendulum==2.0.3
-pipenv==2018.7.1
+pipenv==2018.11.26
 py-oauth2==0.0.10
-pycparser==2.18
-pylint==2.1.1
-python-dateutil==2.7.3
-pytzdata==2018.5
-requests>=2.20.1
-requests-oauthlib==1.0.0
-six==1.11.0
-urllib3>=1.24.2
-virtualenv==16.0.0
-virtualenv-clone==0.3.0
-Werkzeug==0.14.1
-wrapt==1.10.11
+pycparser==2.19
+pylint==2.4.4
+python-dateutil==2.8.1
+requests>=2.22.0
+requests-oauthlib==1.3.0
+six==1.13.0
+urllib3>=1.25.8
+virtualenv==16.7.5
+virtualenv-clone==0.5.3
+Werkzeug==0.16.0
+wrapt==1.11.2

From e657811165f0dcf0844fad620fecadab1fd9f6a5 Mon Sep 17 00:00:00 2001
From: Paige Rossi <70241979+paigesrossi@users.noreply.github.com>
Date: Wed, 2 Sep 2020 13:56:45 -0700
Subject: [PATCH 2/3] Update readme

Updating the readme to describe the right repository (previously eg-03-python-auth-code-grant, now code-examples-python)
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 21c72e1c..273cf778 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Python: Authorization Code Grant Examples
 
-### Github repo: eg-03-python-auth-code-grant
+### Github repo: code-examples-python
 ## Introduction
 This repo is a Python 3 application that demonstrates:
 
@@ -107,8 +107,8 @@ The **refresh token** is not used in this example.
 1. A name and email for a signer, and a name and email for a cc recipient.
 
 ### Installation steps
-1. Download or clone this repository to your workstation to directory **eg-03-python-auth-code-grant**
-1. **cd eg-03-python-auth-code-grant**
+1. Download or clone this repository to your workstation to directory **code-examples-python**
+1. **cd code-examples-python**
 1. **pip3 install -r requirements.txt**  (or pipenv can be used)
 1. Update the file **app/ds_config.py**
      with the Integration Key and other settings.

From bc16ef05b3c531709dbfa5329a3c030acb596b8e Mon Sep 17 00:00:00 2001
From: Paige Rossi <Paige.Rossi@dsa026975.docusignhq.com>
Date: Wed, 2 Sep 2020 14:55:17 -0700
Subject: [PATCH 3/3] updating docusign_esign to 3.5.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 10d80625..71a3eae1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ cffi==1.13.2
 chardet==3.0.4
 Click==7.0
 cryptography==2.8
-docusign-esign==3.1.0rc2
+docusign-esign==3.5.0
 Flask==1.1.1
 Flask-OAuthlib==0.9.5
 flask-wtf==0.14.3