Merge pull request #49 from sethmlarson/ipv4-hosts

Fix regex for IPv4 hosts

Author: sigmavirus24

src/rfc3986/abnf_regexp.py

@@ -25,7 +25,7 @@
 ALPHA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
 DIGIT = '0123456789'
 # https://tools.ietf.org/html/rfc3986#section-2.3
-UNRESERVED = UNRESERVED_CHARS = ALPHA + DIGIT + '._!-'
+UNRESERVED = UNRESERVED_CHARS = ALPHA + DIGIT + r'._!-'
 UNRESERVED_CHARS_SET = set(UNRESERVED_CHARS)
 NON_PCT_ENCODED_SET = RESERVED_CHARS_SET.union(UNRESERVED_CHARS_SET)
 # We need to escape the '-' in this case:
@@ -75,7 +75,7 @@
     '%[0-9A-Fa-f]{2}', SUB_DELIMITERS_RE + UNRESERVED_RE
 )
 # The pattern for an IPv4 address, e.g., 192.168.255.255, 127.0.0.1,
-IPv4_RE = '([0-9]{1,3}.){3}[0-9]{1,3}'
+IPv4_RE = r'([0-9]{1,3}\.){3}[0-9]{1,3}'
 # Hexadecimal characters used in each piece of an IPv6 address
 HEXDIG_RE = '[0-9A-Fa-f]{1,4}'
 # Least-significant 32 bits of an IPv6 address
@@ -111,7 +111,7 @@
     *variations
 )
 
-IPv_FUTURE_RE = 'v[0-9A-Fa-f]+.[%s]+' % (
+IPv_FUTURE_RE = r'v[0-9A-Fa-f]+\.[%s]+' % (
     UNRESERVED_RE + SUB_DELIMITERS_RE + ':'
 )
 

tests/conftest.py

@@ -25,7 +25,8 @@
     'www.example.com',
     'localhost',
     'http-bin.org',
-    '%2Fvar%2Frun%2Fsocket'
+    '%2Fvar%2Frun%2Fsocket',
+    '6g9m8V6',  # Issue #48
     ]
 
 invalid_hosts = [