[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#21135)

[benjamin.peterson]

http://hg.python.org/cpython/rev/2299cb5e8592
changeset:   90119:2299cb5e8592
parent:      90117:5c3166ec80e1
parent:      90118:54bd06097619
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Apr 03 10:22:22 2014 -0400
summary:
  merge 3.4 (#21135)

files:
  Lib/cgi.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/cgi.py b/Lib/cgi.py
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -1045,7 +1045,7 @@
     return s
 
 
-def valid_boundary(s, _vb_pattern=None):
+def valid_boundary(s):
     import re
     if isinstance(s, bytes):
         _vb_pattern = b"^[ -~]{0,200}[!-~]$"

-- 
Repository URL: http://hg.python.org/cpython