prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  should_bypass_proxies still an issue in 4.5.7
  https://github.com/conda/conda/issues/7506#issuecomment-403811279
  
  </issue>
  <code>
  [start of conda/gateways/connection/__init__.py]
  1 # -*- coding: utf-8 -*-
  2 from __future__ import absolute_import, division, print_function, unicode_literals
  3 from functools import partial
  4 
  5 def should_bypass_proxies_patched(should_bypass_proxies_func, url, no_proxy):
  6     # Monkey patch requests, per https://github.com/requests/requests/pull/4723
  7     if url.startswith("file://"):
  8         return True
  9     try:
  10         return should_bypass_proxies_func(url, no_proxy)
  11     except TypeError:
  12         # For versions of requests we shouldn't have to deal with.
  13         # https://github.com/conda/conda/issues/7503
  14         # https://github.com/conda/conda/issues/7506
  15         return should_bypass_proxies_func(url)
  16 
  17 
  18 try:
  19     from requests import ConnectionError, HTTPError, Session
  20     from requests.adapters import BaseAdapter, HTTPAdapter
  21     from requests.auth import AuthBase, _basic_auth_str
  22     from requests.cookies import extract_cookies_to_jar
  23     from requests.exceptions import InvalidSchema, SSLError
  24     from requests.hooks import dispatch_hook
  25     from requests.models import Response
  26     from requests.packages.urllib3.exceptions import InsecureRequestWarning
  27     from requests.structures import CaseInsensitiveDict
  28     from requests.utils import get_auth_from_url, get_netrc_auth
  29 
  30     # monkeypatch requests
  31     from requests.utils import should_bypass_proxies
  32     import requests.utils
  33     requests.utils.should_bypass_proxies = partial(should_bypass_proxies_patched,
  34                                                    should_bypass_proxies)
  35 except ImportError:  # pragma: no cover
  36     from pip._vendor.requests import ConnectionError, HTTPError, Session
  37     from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter
  38     from pip._vendor.requests.auth import AuthBase, _basic_auth_str
  39     from pip._vendor.requests.cookies import extract_cookies_to_jar
  40     from pip._vendor.requests.exceptions import InvalidSchema, SSLError
  41     from pip._vendor.requests.hooks import dispatch_hook
  42     from pip._vendor.requests.models import Response
  43     from pip._vendor.requests.packages.urllib3.exceptions import InsecureRequestWarning
  44     from pip._vendor.requests.structures import CaseInsensitiveDict
  45     from pip._vendor.requests.utils import get_auth_from_url, get_netrc_auth
  46 
  47     # monkeypatch requests
  48     from pip._vendor.requests.utils import should_bypass_proxies
  49     import pip._vendor.requests.utils
  50     pip._vendor.requests.utils.should_bypass_proxies = partial(should_bypass_proxies_patched,
  51                                                                should_bypass_proxies)
  52 
  53 
  54 dispatch_hook = dispatch_hook
  55 BaseAdapter = BaseAdapter
  56 Response = Response
  57 CaseInsensitiveDict = CaseInsensitiveDict
  58 Session = Session
  59 HTTPAdapter = HTTPAdapter
  60 AuthBase = AuthBase
  61 _basic_auth_str = _basic_auth_str
  62 extract_cookies_to_jar = extract_cookies_to_jar
  63 get_auth_from_url = get_auth_from_url
  64 get_netrc_auth = get_netrc_auth
  65 ConnectionError = ConnectionError
  66 HTTPError = HTTPError
  67 InvalidSchema = InvalidSchema
  68 SSLError = SSLError
  69 InsecureRequestWarning = InsecureRequestWarning
  70
  [end of conda/gateways/connection/__init__.py]
  </code>
  
  I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
  <patch>
  diff --git a/file.py b/file.py
  --- a/file.py
  +++ b/file.py
  @@ -1,27 +1,35 @@
   def euclidean(a, b):
  -    while b:
  -        a, b = b, a % b
  -    return a
  +    if b == 0:
  +        return a
  +    return euclidean(b, a % b)
   
   
   def bresenham(x0, y0, x1, y1):
       points = []
       dx = abs(x1 - x0)
       dy = abs(y1 - y0)
  -    sx = 1 if x0 < x1 else -1
  -    sy = 1 if y0 < y1 else -1
  -    err = dx - dy
  +    x, y = x0, y0
  +    sx = -1 if x0 > x1 else 1
  +    sy = -1 if y0 > y1 else 1
   
  -    while True:
  -        points.append((x0, y0))
  -        if x0 == x1 and y0 == y1:
  -            break
  -        e2 = 2 * err
  -        if e2 > -dy:
  -            err -= dy
  -            x0 += sx
  -        if e2 < dx:
  -            err += dx
  -            y0 += sy
  +    if dx > dy:
  +        err = dx / 2.0
  +        while x != x1:
  +            points.append((x, y))
  +            err -= dy
  +            if err < 0:
  +                y += sy
  +                err += dx
  +            x += sx
  +    else:
  +        err = dy / 2.0
  +        while y != y1:
  +            points.append((x, y))
  +            err -= dx
  +            if err < 0:
  +                x += sx
  +                err += dy
  +            y += sy
  +
  +    points.append((x, y))
       return points
  
  </patch>
golden_diff: diff --git a/conda/gateways/connection/__init__.py b/conda/gateways/connection/__init__.py
  --- a/conda/gateways/connection/__init__.py
  +++ b/conda/gateways/connection/__init__.py
  @@ -2,7 +2,7 @@
   from __future__ import absolute_import, division, print_function, unicode_literals
   from functools import partial
   
  -def should_bypass_proxies_patched(should_bypass_proxies_func, url, no_proxy):
  +def should_bypass_proxies_patched(should_bypass_proxies_func, url, no_proxy=None):
       # Monkey patch requests, per https://github.com/requests/requests/pull/4723
       if url.startswith("file://"):
           return True
  
verification_info: {"golden_diff": "diff --git a/conda/gateways/connection/__init__.py b/conda/gateways/connection/__init__.py\n--- a/conda/gateways/connection/__init__.py\n+++ b/conda/gateways/connection/__init__.py\n@@ -2,7 +2,7 @@\n from __future__ import absolute_import, division, print_function, unicode_literals\n from functools import partial\n \n-def should_bypass_proxies_patched(should_bypass_proxies_func, url, no_proxy):\n+def should_bypass_proxies_patched(should_bypass_proxies_func, url, no_proxy=None):\n     # Monkey patch requests, per https://github.com/requests/requests/pull/4723\n     if url.startswith(\"file://\"):\n         return True\n", "issue": "should_bypass_proxies still an issue in 4.5.7\nhttps://github.com/conda/conda/issues/7506#issuecomment-403811279\n", "before_files": [{"content": "# -*- coding: utf-8 -*-\nfrom __future__ import absolute_import, division, print_function, unicode_literals\nfrom functools import partial\n\ndef should_bypass_proxies_patched(should_bypass_proxies_func, url, no_proxy):\n    # Monkey patch requests, per https://github.com/requests/requests/pull/4723\n    if url.startswith(\"file://\"):\n        return True\n    try:\n        return should_bypass_proxies_func(url, no_proxy)\n    except TypeError:\n        # For versions of requests we shouldn't have to deal with.\n        # https://github.com/conda/conda/issues/7503\n        # https://github.com/conda/conda/issues/7506\n        return should_bypass_proxies_func(url)\n\n\ntry:\n    from requests import ConnectionError, HTTPError, Session\n    from requests.adapters import BaseAdapter, HTTPAdapter\n    from requests.auth import AuthBase, _basic_auth_str\n    from requests.cookies import extract_cookies_to_jar\n    from requests.exceptions import InvalidSchema, SSLError\n    from requests.hooks import dispatch_hook\n    from requests.models import Response\n    from requests.packages.urllib3.exceptions import InsecureRequestWarning\n    from requests.structures import CaseInsensitiveDict\n    from requests.utils import get_auth_from_url, get_netrc_auth\n\n    # monkeypatch requests\n    from requests.utils import should_bypass_proxies\n    import requests.utils\n    requests.utils.should_bypass_proxies = partial(should_bypass_proxies_patched,\n                                                   should_bypass_proxies)\nexcept ImportError:  # pragma: no cover\n    from pip._vendor.requests import ConnectionError, HTTPError, Session\n    from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter\n    from pip._vendor.requests.auth import AuthBase, _basic_auth_str\n    from pip._vendor.requests.cookies import extract_cookies_to_jar\n    from pip._vendor.requests.exceptions import InvalidSchema, SSLError\n    from pip._vendor.requests.hooks import dispatch_hook\n    from pip._vendor.requests.models import Response\n    from pip._vendor.requests.packages.urllib3.exceptions import InsecureRequestWarning\n    from pip._vendor.requests.structures import CaseInsensitiveDict\n    from pip._vendor.requests.utils import get_auth_from_url, get_netrc_auth\n\n    # monkeypatch requests\n    from pip._vendor.requests.utils import should_bypass_proxies\n    import pip._vendor.requests.utils\n    pip._vendor.requests.utils.should_bypass_proxies = partial(should_bypass_proxies_patched,\n                                                               should_bypass_proxies)\n\n\ndispatch_hook = dispatch_hook\nBaseAdapter = BaseAdapter\nResponse = Response\nCaseInsensitiveDict = CaseInsensitiveDict\nSession = Session\nHTTPAdapter = HTTPAdapter\nAuthBase = AuthBase\n_basic_auth_str = _basic_auth_str\nextract_cookies_to_jar = extract_cookies_to_jar\nget_auth_from_url = get_auth_from_url\nget_netrc_auth = get_netrc_auth\nConnectionError = ConnectionError\nHTTPError = HTTPError\nInvalidSchema = InvalidSchema\nSSLError = SSLError\nInsecureRequestWarning = InsecureRequestWarning\n", "path": "conda/gateways/connection/__init__.py"}]}