Aug 4, 2022 · Aug 4, 2022 · Aug 4, 2022 · Aug 4, 2022 · Aug 4, 2022 · Aug 4, 2022
diff --git a/gitlab/client.py b/gitlab/client.py
 import re
 import time
 from typing import Any, cast, Dict, List, Optional, Tuple, TYPE_CHECKING, Union
 from urllib import parse

 import requests
 import requests.utils
            GitlabHttpError: When the return code is not 2xx
        """
        query_data = query_data or {}
 url = self._build_url(path)
 raw_url = self._build_url(path)

        params: Dict[str, Any] = {}
        # parse user-provided URL params to ensure we don't add our own duplicates
        parsed = parse.urlparse(raw_url)
        params = parse.parse_qs(parsed.query)
        utils.copy_dict(src=query_data, dest=params)

        url = raw_url.replace(parsed.query, "").strip("?")

        # Deal with kwargs: by default a user uses kwargs to send data to the
        # gitlab server, but this generates problems (python keyword conflicts
        # and python-gitlab/gitlab conflicts).
diff --git a/tests/unit/test_gitlab_http_methods.py b/tests/unit/test_gitlab_http_methods.py
    assert responses.assert_call_count(url, 1) is True


 @responses.activate
 def test_http_request_with_url_encoded_kwargs_does_not_duplicate_params(gl):
    url = "http://localhost/api/v4/projects?topics%5B%5D=python"
    responses.add(
        method=responses.GET,
        url=url,
        json=[{"name": "project1"}],
        status=200,
        match=[responses.matchers.query_param_matcher({"topics[]": "python"})],
    )

    kwargs = {"topics[]": "python"}
    http_r = gl.http_request("get", "/projects?topics%5B%5D=python", **kwargs)
    http_r.json()
    assert http_r.status_code == 200
    assert responses.assert_call_count(url, 1)


 @responses.activate
 def test_http_request_404(gl):
    url = "http://localhost/api/v4/not_there"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,7 @@
		import re
		import time
		from typing import Any, cast, Dict, List, Optional, Tuple, TYPE_CHECKING, Union
		from urllib import parse

		import requests
		import requests.utils
Expand DownExpand Up		@@ -677,11 +678,15 @@ def http_request(
		GitlabHttpError: When the return code is not 2xx
		"""
		query_data = query_data or {}
		url = self._build_url(path)
		raw_url = self._build_url(path)

		params: Dict[str, Any] = {}
		# parse user-provided URL params to ensure we don't add our own duplicates
		parsed = parse.urlparse(raw_url)
		params = parse.parse_qs(parsed.query)
		utils.copy_dict(src=query_data, dest=params)

		url = raw_url.replace(parsed.query, "").strip("?")
Copy link Member JohnVillalovosAug 4, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Why not use`parse.urlunparse`? `url = parse.urlunparse(parsed._replace(query=""))` Copy link MemberAuthor nejchAug 4, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I saw that on stackoverflow as well but it uses a private method (`_replace`) so didn't want to touch that 😁 JohnVillalovos reacted with laugh emoji Copy link Member JohnVillalovosAug 4, 2022• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Oh it is documented in the official docs: https://docs.python.org/3/library/urllib.parse.html As is the case with all named tuples, the subclass has a few additional methods and attributes that are particularly useful. One such method is _replace(). The _replace() method will return a new ParseResult object replacing specified fields with new values.

		# Deal with kwargs: by default a user uses kwargs to send data to the
		# gitlab server, but this generates problems (python keyword conflicts
		# and python-gitlab/gitlab conflicts).
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,6 +36,24 @@ def test_http_request(gl):
		assert responses.assert_call_count(url, 1) is True


		@responses.activate
		def test_http_request_with_url_encoded_kwargs_does_not_duplicate_params(gl):
		url = "http://localhost/api/v4/projects?topics%5B%5D=python"
		responses.add(
		method=responses.GET,
		url=url,
		json=[{"name": "project1"}],
		status=200,
		match=[responses.matchers.query_param_matcher({"topics[]": "python"})],
		)

		kwargs = {"topics[]": "python"}
		http_r = gl.http_request("get", "/projects?topics%5B%5D=python", **kwargs)
		http_r.json()
		assert http_r.status_code == 200
		assert responses.assert_call_count(url, 1)


		@responses.activate
		def test_http_request_404(gl):
		url = "http://localhost/api/v4/not_there"
Expand Down