Merge branch 'hyperwallet-master'

Author: aseveryn-hw

CHANGELOG.rst

@@ -1,12 +1,7 @@
 Changelog
 =========
 
-1.1.5 (2018-09-05)
-------------------
-
-- Added Layer 7 encryption for Hyperwallet client
-
-1.1.4 (2018-08-05)
+1.1.4 (current)
 ------------------
 
 - Added PayPal account endpoint
@@ -16,7 +11,7 @@ Changelog
 
 - Added transfer endpoint
 
-1.1.2 (2018-08-03)
+1.1.2 (2018-03-20)
 ------------------
 
 - Added bank card endpoint

LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2017 Hyperwallet Systems Inc.
+Copyright (c) 2018 Hyperwallet Systems Inc.
 
 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:
 

doc/conf.py

@@ -51,15 +51,15 @@
 
 # General information about the project.
 project = u'hyperwallet-sdk'
-copyright = u'2016, Dan Harrison'
-author = u'Dan Harrison'
+copyright = u'2018, Hyperwallet Systems Inc'
+author = u'Hyperwallet Systems Inc'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.1'
+version = u'0.4'
 # The full version, including alpha/beta/rc tags.
 release = u'0.1'
 

hyperwallet/utils/apiclient.py

@@ -54,7 +54,7 @@ def __init__(self, username, password, server, encryptionData=None):
 
         # The default connection to persist authentication and SSL settings.
         defaultSession = requests.Session()
-        defaultSession.mount(self.server, SSLAdapter(ssl.PROTOCOL_TLSv1_2))
+        defaultSession.mount(self.server, SSLAdapter())
         defaultSession.auth = (self.username, self.password)
         defaultSession.headers = self.baseHeaders