Fix requesting urls containing parameters with parameters dict

github/Requester.py

@@ -468,6 +468,28 @@ def get_graphql_prefix(path: Optional[str]) -> str:
  path = Requester.remove_suffix(path, "/v3")
  return path + "/graphql"
 
+ @staticmethod
+ def addParametersToUrl(
+ url: str,
+ parameters: Dict[str, Any],
+ ) -> str:
+ # union parameters in url with given parameters, where url has precedence
+ scheme, netloc, url, params, query, fragment = urllib.parse.urlparse(url)
+ url_params = urllib.parse.parse_qs(query)
+ parameters = dict(parameters, **url_params)
+ parameter_list = [
+ (key, value)
+ for key, values in parameters.items()
+ for value in (values if isinstance(values, list) else [values])
+ ]
+ # remove query from url
+ url = urllib.parse.urlunparse((scheme, netloc, url, params, "", fragment))
+
+ if len(parameter_list) == 0:
+ return url
+ else:
+ return f"{url}?{urllib.parse.urlencode(parameter_list)}"
+
  def close(self) -> None:
  """
  Close the connection to the server.
@@ -798,7 +820,7 @@ def __requestEncode(
  requestHeaders["User-Agent"] = self.__userAgent
 
  url = self.__makeAbsoluteUrl(url)
- url = self.__addParametersToUrl(url, parameters)
+ url = Requester.addParametersToUrl(url, parameters)
 
  encoded_input = None
  if input is not None:
@@ -934,16 +956,6 @@ def __makeAbsoluteUrl(self, url: str) -> str:
  url += f"?{o.query}"
  return url
 
- def __addParametersToUrl(
- self,
- url: str,
- parameters: Dict[str, Any],
- ) -> str:
- if len(parameters) == 0:
- return url
- else:
- return f"{url}?{urllib.parse.urlencode(parameters)}"
-
  def __createConnection(
  self,
  ) -> Union[HTTPRequestsConnectionClass, HTTPSRequestsConnectionClass]:

tests/PaginatedList.py

@@ -37,6 +37,8 @@
 # #
 ################################################################################
 
+from datetime import datetime, timezone
+
 from github.PaginatedList import PaginatedList as PaginatedListImpl
 
 from . import Framework
@@ -326,6 +328,40 @@ def testCustomPerPageWithGetPage(self):
  self.g.per_page = 100
  self.assertEqual(len(self.repo.get_issues().get_page(2)), 100)
 
+ def testCustomPerPageIteration(self):
+ self.g.per_page = 3
+ repo = self.g.get_repo("PyGithub/PyGithub")
+ comments = repo.get_issue(1136).get_comments()
+ self.assertEqual(
+ [
+ datetime(2019, 8, 10, 18, 16, 46, tzinfo=timezone.utc),
+ datetime(2024, 1, 6, 16, 4, 34, tzinfo=timezone.utc),
+ datetime(2024, 1, 6, 17, 34, 11, tzinfo=timezone.utc),
+ datetime(2024, 3, 20, 15, 24, 15, tzinfo=timezone.utc),
+ datetime(2024, 3, 21, 10, 55, 14, tzinfo=timezone.utc),
+ datetime(2024, 3, 21, 14, 2, 22, tzinfo=timezone.utc),
+ datetime(2024, 3, 24, 13, 58, 57, tzinfo=timezone.utc),
+ ],
+ [comment.created_at for comment in comments],
+ )
+
+ def testCustomPerPageReversedIteration(self):
+ self.g.per_page = 3
+ repo = self.g.get_repo("PyGithub/PyGithub")
+ comments = repo.get_issue(1136).get_comments().reversed
+ self.assertEqual(
+ [
+ datetime(2024, 3, 24, 13, 58, 57, tzinfo=timezone.utc),
+ datetime(2024, 3, 21, 14, 2, 22, tzinfo=timezone.utc),
+ datetime(2024, 3, 21, 10, 55, 14, tzinfo=timezone.utc),
+ datetime(2024, 3, 20, 15, 24, 15, tzinfo=timezone.utc),
+ datetime(2024, 1, 6, 17, 34, 11, tzinfo=timezone.utc),
+ datetime(2024, 1, 6, 16, 4, 34, tzinfo=timezone.utc),
+ datetime(2019, 8, 10, 18, 16, 46, tzinfo=timezone.utc),
+ ],
+ [comment.created_at for comment in comments],
+ )
+
  def testNoFirstPage(self):
  self.assertFalse(next(iter(self.list), None))