merge 3.4 (#21135)

2995f8a7 · Benjamin Peterson · 10fbf183 · 4d59a787 · 2995f8a7
Commit 2995f8a7 authored Apr 03, 2014 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Lib/cgi.py Lib/cgi.py +1 -1

No files found.
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -1045,7 +1045,7 @@ def escape(s, quote=None):
    return s


-def valid_boundary(s, _vb_pattern=None):
+def valid_boundary(s):
    import re
    if isinstance(s, bytes):
        _vb_pattern = b"^[ -~]{0,200}[!-~]$"