Merge branch 'rel/5.2' into core-rest-flask

This commit is contained in:
Blake J. Harnden 2018-08-17 11:00:55 -07:00
commit 1ddea3ed54
3 changed files with 27 additions and 5 deletions

View file

@ -126,7 +126,7 @@ def make_tuple_fromstr(s, value_type):
"""
Create a tuple from a string.
:param str s: string to convert to a tuple
:param str|unicode s: string to convert to a tuple
:param value_type: type of values to be contained within tuple
:return: tuple from string
:rtype: tuple