Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/plq/werkzeug

  • Loading branch information...
commit 34b22a5b13ffb46cd3c77e3da55bfcf6348051ce 2 parents 770ff21 + 9e50166
@kennethreitz kennethreitz authored
Showing with 3 additions and 4 deletions.
  1. +3 −4 werkzeug/formparser.py
View
7 werkzeug/formparser.py
@@ -103,7 +103,7 @@ def wrapper(self, stream, *args, **kwargs):
class FormDataParser(object):
"""This class implements parsing of form data for Werkzeug. By itself
- it can parse multipart and url encoded form data. It can be subclasses
+ it can parse multipart and url encoded form data. It can be subclassed
and extended but for most mimetypes it is a better idea to use the
untouched stream and expose it as separate attributes on a request
object.
@@ -264,7 +264,6 @@ def parse_multipart_headers(iterable):
class MultiPartParser(object):
-
def __init__(self, stream_factory=None, charset='utf-8', errors='replace',
max_form_memory_size=None, cls=None, buffer_size=10 * 1024):
self.stream_factory = stream_factory
@@ -348,8 +347,8 @@ def validate_boundary(self, boundary):
if len(boundary) > self.buffer_size: # pragma: no cover
# this should never happen because we check for a minimum size
# of 1024 and boundaries may not be longer than 200. The only
- # situation when this happen is for non debug builds where
- # the assert i skipped.
+ # situation when this happens is for non debug builds where
+ # the assert is skipped.
self.fail('Boundary longer than buffer size')
def parse(self, file, boundary, content_length):
Please sign in to comment.
Something went wrong with that request. Please try again.