mirror of
https://github.com/quay/quay.git
synced 2025-04-18 10:44:06 +03:00
* Convert all Python2 to Python3 syntax. * Removes oauth2lib dependency * Replace mockredis with fakeredis * byte/str conversions * Removes nonexisting __nonzero__ in Python3 * Python3 Dockerfile and related * [PROJQUAY-98] Replace resumablehashlib with rehash * PROJQUAY-123 - replace gpgme with python3-gpg * [PROJQUAY-135] Fix unhashable class error * Update external dependencies for Python 3 - Move github.com/app-registry/appr to github.com/quay/appr - github.com/coderanger/supervisor-stdout - github.com/DevTable/container-cloud-config - Update to latest mockldap with changes applied from coreos/mockldap - Update dependencies in requirements.txt and requirements-dev.txt * Default FLOAT_REPR function to str in json encoder and removes keyword assignment True, False, and str were not keywords in Python2... * [PROJQUAY-165] Replace package `bencode` with `bencode.py` - Bencode is not compatible with Python 3.x and is no longer maintained. Bencode.py appears to be a drop-in replacement/fork that is compatible with Python 3. * Make sure monkey.patch is called before anything else ( * Removes anunidecode dependency and replaces it with text_unidecode * Base64 encode/decode pickle dumps/loads when storing value in DB Base64 encodes/decodes the serialized values when storing them in the DB. Also make sure to return a Python3 string instead of a Bytes when coercing for db, otherwise, Postgres' TEXT field will convert it into a hex representation when storing the value. * Implement __hash__ on Digest class In Python 3, if a class defines __eq__() but not __hash__(), its instances will not be usable as items in hashable collections (e.g sets). * Remove basestring check * Fix expected message in credentials tests * Fix usage of Cryptography.Fernet for Python3 (#219) - Specifically, this addresses the issue where Byte<->String conversions weren't being applied correctly. * Fix utils - tar+stream layer format utils - filelike util * Fix storage tests * Fix endpoint tests * Fix workers tests * Fix docker's empty layer bytes * Fix registry tests * Appr * Enable CI for Python 3.6 * Skip buildman tests Skip buildman tests while it's being rewritten to allow ci to pass. * Install swig for CI * Update expected exception type in redis validation test * Fix gpg signing calls Fix gpg calls for updated gpg wrapper, and add signing tests. * Convert / to // for Python3 integer division * WIP: Update buildman to use asyncio instead of trollius. This dependency is considered deprecated/abandoned and was only used as an implementation/backport of asyncio on Python 2.x This is a work in progress, and is included in the PR just to get the rest of the tests passing. The builder is actually being rewritten. * Target Python 3.8 * Removes unused files - Removes unused files that were added accidentally while rebasing - Small fixes/cleanup - TODO tasks comments * Add TODO to verify rehash backward compat with resumablehashlib * Revert "[PROJQUAY-135] Fix unhashable class error" and implements __hash__ instead. This reverts commit 735e38e3c1d072bf50ea864bc7e119a55d3a8976. Instead, defines __hash__ for encryped fields class, using the parent field's implementation. * Remove some unused files ad imports Co-authored-by: Kenny Lee Sin Cheong <kenny.lee@redhat.com> Co-authored-by: Tom McKay <thomasmckay@redhat.com>
66 lines
1.8 KiB
Python
66 lines
1.8 KiB
Python
# Ported to Python 3
|
|
# Originally from https://github.com/DeprecatedCode/oauth2lib/blob/d161b010f8a596826050a09e5e94d59443cc12d9/oauth2lib/provider.py
|
|
|
|
import string
|
|
import urllib.parse
|
|
from random import SystemRandom
|
|
|
|
UNICODE_ASCII_CHARACTERS = string.ascii_letters + string.digits
|
|
|
|
|
|
def random_ascii_string(length):
|
|
random = SystemRandom()
|
|
return "".join([random.choice(UNICODE_ASCII_CHARACTERS) for _ in range(length)])
|
|
|
|
|
|
def url_query_params(url):
|
|
"""Return query parameters as a dict from the specified URL.
|
|
|
|
:param url: URL.
|
|
:type url: str
|
|
:rtype: dict
|
|
"""
|
|
return dict(urllib.parse.parse_qsl(urllib.parse.urlparse(url).query, True))
|
|
|
|
|
|
def url_dequery(url):
|
|
"""Return a URL with the query component removed.
|
|
|
|
:param url: URL to dequery.
|
|
:type url: str
|
|
:rtype: str
|
|
"""
|
|
url = urllib.parse.urlparse(url)
|
|
return urllib.parse.urlunparse((url.scheme, url.netloc, url.path, url.params, "", url.fragment))
|
|
|
|
|
|
def build_url(base, additional_params=None):
|
|
"""Construct a URL based off of base containing all parameters in
|
|
the query portion of base plus any additional parameters.
|
|
|
|
:param base: Base URL
|
|
:type base: str
|
|
::param additional_params: Additional query parameters to include.
|
|
:type additional_params: dict
|
|
:rtype: str
|
|
"""
|
|
url = urllib.parse.urlparse(base)
|
|
query_params = {}
|
|
query_params.update(urllib.parse.parse_qsl(url.query, True))
|
|
if additional_params is not None:
|
|
query_params.update(additional_params)
|
|
for k, v in additional_params.items():
|
|
if v is None:
|
|
query_params.pop(k)
|
|
|
|
return urllib.parse.urlunparse(
|
|
(
|
|
url.scheme,
|
|
url.netloc,
|
|
url.path,
|
|
url.params,
|
|
urllib.parse.urlencode(query_params),
|
|
url.fragment,
|
|
)
|
|
)
|