dev-python/oauth2client-4.1.3-r1: revbump, EAPI=7, add py38

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
This commit is contained in:
Patrick McLean
2020-05-06 18:33:32 -07:00
committed by Patrick McLean
parent 54e97ff7f7
commit c5b2eb834b
2 changed files with 96 additions and 0 deletions

View File

@@ -0,0 +1,35 @@
diff --git a/oauth2client/contrib/xsrfutil.py b/oauth2client/contrib/xsrfutil.py
index 7c3ec03..20f35c9 100644
--- a/oauth2client/contrib/xsrfutil.py
+++ b/oauth2client/contrib/xsrfutil.py
@@ -44,7 +44,7 @@ def generate_token(key, user_id, action_id='', when=None):
Returns:
A string XSRF protection token.
"""
- digester = hmac.new(_helpers._to_bytes(key, encoding='utf-8'))
+ digester = hmac.new(_helpers._to_bytes(key, encoding='utf-8'), digestmod='MD5')
digester.update(_helpers._to_bytes(str(user_id), encoding='utf-8'))
digester.update(DELIMITER)
digester.update(_helpers._to_bytes(action_id, encoding='utf-8'))
diff --git a/tests/contrib/test_xsrfutil.py b/tests/contrib/test_xsrfutil.py
index 3115827..deae568 100644
--- a/tests/contrib/test_xsrfutil.py
+++ b/tests/contrib/test_xsrfutil.py
@@ -54,7 +54,7 @@ class Test_generate_token(unittest.TestCase):
TEST_USER_ID_1,
action_id=TEST_ACTION_ID_1,
when=TEST_TIME)
- hmac.new.assert_called_once_with(TEST_KEY)
+ hmac.new.assert_called_once_with(TEST_KEY, digestmod='MD5')
digester.digest.assert_called_once_with()
expected_digest_calls = [
@@ -87,7 +87,7 @@ class Test_generate_token(unittest.TestCase):
TEST_USER_ID_1,
action_id=TEST_ACTION_ID_1)
- hmac.new.assert_called_once_with(TEST_KEY)
+ hmac.new.assert_called_once_with(TEST_KEY, digestmod='MD5')
time.time.assert_called_once_with()
digester.digest.assert_called_once_with()

View File

@@ -0,0 +1,61 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
HOMEPAGE="https://github.com/google/oauth2client"
SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}"/${P/_p/-post}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
RDEPEND="
>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
dev-python/keyring[${PYTHON_USEDEP}]
!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
"
BDEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? ( ${RDEPEND}
dev-python/sqlalchemy[${PYTHON_USEDEP}]
)
"
PATCHES=(
"${FILESDIR}/oauth2client-4.1.3-py38.patch"
)
python_prepare() {
# keyring is not fuly supported by pypy yet, because dbus-python can't support pypy
# oauth2client -> keyring -> secretstorage -> dbus-python
# https://github.com/mitya57/secretstorage/issues/10
case $PYTHON in
pypy|*pypy|*pypy3|pypy3) \
find "${BUILD_DIR}/.." -name '*keyring*py' -delete ;;
esac
}
python_test() {
nosetests -v \
-e appengine \
-e django_util \
-e test_multiprocess_file_storage \
-e test_bad_positional || die "tests fail with ${EPYTHON}"
# appengine - requires appengine
# django_util - requires django
# test_multiprocess_file_storage - requires fasteners
# test_bad_positional - expects TypeError, gets ValueError
}