From 70f794b0af2e400228495061a24991c56bda23e8 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie+git@gmail.com>
Date: Thu, 26 May 2016 13:29:48 -0400
Subject: [PATCH] replace rfc3987 library with urlparse

The former is GPL licensed.
---
 endpoints/api/build.py | 9 +++++----
 requirements-nover.txt | 1 -
 requirements.txt       | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/endpoints/api/build.py b/endpoints/api/build.py
index 972255955..4f3307ab5 100644
--- a/endpoints/api/build.py
+++ b/endpoints/api/build.py
@@ -1,18 +1,19 @@
 """ Create, list, cancel and get status/logs of repository builds. """
 
+from urlparse import urlparse
+
 import logging
 import json
 import datetime
 import hashlib
 
 from flask import request
-from rfc3987 import parse as uri_parse
 
 from app import app, userfiles as user_files, build_logs, log_archive, dockerfile_build_queue
 from buildtrigger.basehandler import BuildTriggerHandler
 from endpoints.api import (RepositoryParamResource, parse_args, query_param, nickname, resource,
                            require_repo_read, require_repo_write, validate_json_request,
-                           ApiResource, internal_only, format_date, api, path_param, 
+                           ApiResource, internal_only, format_date, api, path_param,
                            require_repo_admin)
 from endpoints.exception import Unauthorized, NotFound, InvalidRequest
 from endpoints.building import start_build, PreparedBuild
@@ -220,14 +221,14 @@ class RepositoryBuildList(RepositoryParamResource):
     if archive_url:
       archive_match = None
       try:
-        archive_match = uri_parse(archive_url, 'URI')
+        archive_match = urlparse(archive_url)
       except ValueError:
         pass
 
       if not archive_match:
         raise InvalidRequest('Invalid Archive URL: Must be a valid URI')
 
-      scheme = archive_match.get('scheme', None)
+      scheme = archive_match.scheme
       if scheme != 'http' and scheme != 'https':
         raise InvalidRequest('Invalid Archive URL: Must be http or https')
 
diff --git a/requirements-nover.txt b/requirements-nover.txt
index d19715a0a..3898df463 100644
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@@ -54,7 +54,6 @@ Flask-Testing
 pyjwt
 toposort
 pyjwkest
-rfc3987
 jsonpath-rw
 bintrees
 redlock
diff --git a/requirements.txt b/requirements.txt
index ce982e43e..1e2557ac8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -101,7 +101,6 @@ reportlab==2.7
 requests==2.9.1
 requests-oauthlib==0.6.1
 -e git+https://github.com/coreos/resumablehashlib.git@b1b631249589b07adf40e0ee545b323a501340b4#egg=resumablehashlib
-rfc3987==1.3.5
 semantic-version==2.5.0
 six==1.10.0
 SQLAlchemy==1.0.12