Merge branch 'main' into fix_port_colon

Author: sigmavirus24

src/rfc3986/abnf_regexp.py

@@ -42,7 +42,7 @@
 _AUTHORITY_RE = "[^\\\\/?#]*"
 _PATH_RE = "[^?#]*"
 _QUERY_RE = "[^#]*"
-_FRAGMENT_RE = ".*"
+_FRAGMENT_RE = "(?s:.*)"
 
 # Extracted from http://tools.ietf.org/html/rfc3986#appendix-B
 COMPONENT_PATTERN_DICT = {

tests/base.py

@@ -156,7 +156,16 @@ def test_handles_port_but_no_colon(self, uri_with_port_but_no_colon):
                 raise AssertionError(
                     "No error thrown from URI with port but no colon"
                 )
-
+                
+    def test_handles_line_terminators_in_fragment(
+        self, uri_fragment_with_line_terminators
+    ):
+        """Test that self.test_class encodes line terminators in the fragment properly"""
+        ref = self.test_class.from_string(
+            uri_fragment_with_line_terminators, "utf-8"
+        )
+        assert ref.fragment == "%0Afrag%0Ament%0A"
+        
 
 class BaseTestUnsplits:
     test_class = None

tests/conftest.py

@@ -156,6 +156,11 @@ def uri_fragment_with_percent(request):
     return "https://%s#perc%%ent" % request.param
 
 
+@pytest.fixture(params=valid_hosts)
+def uri_fragment_with_line_terminators(request):
+    return "https://%s#\nfrag\nment\n" % request.param
+
+
 @pytest.fixture(params=equivalent_schemes)
 def scheme_only(request):
     return "%s:" % request.param