archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Python 3.6: Fixed issue with gravatar function

Browse Source 
Hashing of string object doesn't work. Also added a deprecation warning
that pillar.api.utils.gravatar should be used; pillar.web.utils.gravatar
is just a copy.
This commit is contained in:
Sybren A. Stüvel 2017-03-03 14:42:13 +01:00
parent dcdcd99393
commit ae5009c9ef
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pillar/api/utils/__init__.py
View File

@ -141,10 +141,10 @@ def str2id(document_id):
raise wz_exceptions.BadRequest('Invalid object ID %r' % document_id)
def gravatar(email, size=64):
def gravatar(email: str, size=64):
parameters = {'s': str(size), 'd': 'mm'}
return "https://www.gravatar.com/avatar/" + \
hashlib.md5(str(email)).hexdigest() + \
hashlib.md5(email.encode()).hexdigest() + \
"?" + urllib.parse.urlencode(parameters)

12
pillar/web/utils/__init__.py
View File

@ -49,11 +49,13 @@ def attach_project_pictures(project, api):
project.picture_header = get_file(project.picture_header, api=api)
def gravatar(email, size=64):
parameters = {'s': str(size), 'd': 'mm'}
return "https://www.gravatar.com/avatar/" + \
hashlib.md5(str(email)).hexdigest() + \
"?" + urllib.parse.urlencode(parameters)
def gravatar(email: str, size=64):
import warnings
warnings.warn("the pillar.web.gravatar function is deprecated; use hashlib instead",
DeprecationWarning, 2)
from pillar.api.utils import gravatar as api_gravatar
return api_gravatar(email, size)
def datetime_now():