Repository : http://git.fedorahosted.org/cgit/copr.git On branch : frontend-python3 commit 5ad0dfca188fe37854f1e36b151e4abb044a87c1 Author: Jakub Kadlčík <jkadlcik(a)redhat.com&gt; Date: Mon Sep 21 16:25:28 2015 +0200 [frontend] use six.moves.urllib instead of py2 only urllib frontend/coprs_frontend/coprs/filters.py | 2 +- frontend/coprs_frontend/coprs/forms.py | 8 ++++---- frontend/coprs_frontend/coprs/helpers.py | 4 ++-- .../coprs_frontend/coprs/logic/builds_logic.py | 1 - .../coprs/views/api_ns/api_general.py | 1 - .../coprs/views/coprs_ns/coprs_general.py | 4 ++-- .../coprs_frontend/run/generate_repo_packages.py | 4 ++-- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/frontend/coprs_frontend/coprs/filters.py b/frontend/coprs_frontend/coprs/filters.py index cd0d87a..1bc8c80 100644 --- a/frontend/coprs_frontend/coprs/filters.py +++ b/frontend/coprs_frontend/coprs/filters.py @@ -1,5 +1,5 @@ import datetime -from urlparse import urlparse +from six.moves.urllib.parse import urlparse import pytz import time import markdown diff --git a/frontend/coprs_frontend/coprs/forms.py b/frontend/coprs_frontend/coprs/forms.py index 7ffe436..9e9feda 100644 --- a/frontend/coprs_frontend/coprs/forms.py +++ b/frontend/coprs_frontend/coprs/forms.py @@ -1,5 +1,5 @@ import re -import urlparse +from six.moves.urllib.parse import urlparse import flask import wtforms @@ -28,7 +28,7 @@ class UrlListValidator(object): raise wtforms.ValidationError(self.message.format(u)) def is_url(self, url): - parsed = urlparse.urlparse(url) + parsed = urlparse(url) if not parsed.scheme.startswith("http"): return False if not parsed.netloc: @@ -39,7 +39,7 @@ class UrlListValidator(object): class UrlRepoListValidator(UrlListValidator): """ Allows also `repo://` schema""" def is_url(self, url): - parsed = urlparse.urlparse(url) + parsed = urlparse(url) if parsed.scheme not in ["http", "https", "copr"]: return False if not parsed.netloc: @@ -63,7 +63,7 @@ class UrlSrpmListValidator(UrlListValidator): super(UrlSrpmListValidator, self).__init__(message) def is_url(self, url): - parsed = urlparse.urlparse(url) + parsed = urlparse(url) if not parsed.path.endswith((".src.rpm", ".nosrc.rpm")): return False return True diff --git a/frontend/coprs_frontend/coprs/helpers.py b/frontend/coprs_frontend/coprs/helpers.py index f3406b4..381fde8 100644 --- a/frontend/coprs_frontend/coprs/helpers.py +++ b/frontend/coprs_frontend/coprs/helpers.py @@ -1,9 +1,9 @@ import math import random import string -import urlparse import flask +from six.moves.urllib.parse import urljoin from dateutil import parser as dt_parser from netaddr import IPAddress, IPNetwork @@ -221,7 +221,7 @@ def generate_repo_url(mock_chroot, url): if mock_chroot.os_version != "rawhide": mock_chroot.os_version = "$releasever" - url = urlparse.urljoin( + url = urljoin( url, "{0}-{1}-{2}/".format(mock_chroot.os_release, mock_chroot.os_version, "$basearch")) diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py index 3082b5c..5b5a185 100644 --- a/frontend/coprs_frontend/coprs/logic/builds_logic.py +++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py @@ -1,6 +1,5 @@ from collections import defaultdict import tempfile -import urlparse import shutil import json import os diff --git a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py index 580c2bc..ee6e493 100644 --- a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py +++ b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py @@ -4,7 +4,6 @@ import os import shutil import tempfile import json -import urlparse import flask from werkzeug import secure_filename diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index 7d90c0b..bf37527 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -2,7 +2,7 @@ import os import time import os import re -import urlparse +from six.moves.urllib.parse import urljoin import flask from flask import render_template @@ -641,7 +641,7 @@ def generate_repo_file(username, coprname, name_release, repofile): # add trainling slash url = os.path.join(url, '') repo_url = generate_repo_url(mock_chroot, url) - pubkey_url = urlparse.urljoin(url, "pubkey.gpg") + pubkey_url = urljoin(url, "pubkey.gpg") response = flask.make_response( flask.render_template("coprs/copr.repo", copr=copr, url=repo_url, pubkey_url=pubkey_url)) diff --git a/frontend/coprs_frontend/run/generate_repo_packages.py b/frontend/coprs_frontend/run/generate_repo_packages.py index ab1289b..3a1b71e 100644 --- a/frontend/coprs_frontend/run/generate_repo_packages.py +++ b/frontend/coprs_frontend/run/generate_repo_packages.py @@ -12,10 +12,10 @@ from __future__ import division from __future__ import absolute_import import requests -import urlparse import os import shutil import subprocess +from six.moves.urllib.parse import urljoin here = os.path.dirname(os.path.realpath(__file__)) import sys @@ -76,7 +76,7 @@ class RepoRpmBuilder(object): def get_repofile(self): api = "coprs/{}/{}/repo/{}".format(self.user, self.copr, self.chroot.name) - url = urlparse.urljoin(FRONTEND_URL, api) + url = urljoin(FRONTEND_URL, api) r = requests.get(url) if r.status_code != 200: raise RuntimeError("Can't get {}".format(url))