1
0
mirror of https://github.com/django/django.git synced 2025-10-26 15:16:09 +00:00

Removed many uses of bare "except:", which were either going to a) silence real issues, or b) were impossible to hit.

This commit is contained in:
Alex Gaynor
2012-09-07 15:06:23 -04:00
parent 257c4011cb
commit 335a9f9cf1
10 changed files with 31 additions and 48 deletions

View File

@@ -68,11 +68,10 @@ class MultiPartParser(object):
if not boundary or not cgi.valid_boundary(boundary):
raise MultiPartParserError('Invalid boundary in multipart: %s' % boundary)
# Content-Length should contain the length of the body we are about
# to receive.
try:
content_length = int(META.get('HTTP_CONTENT_LENGTH', META.get('CONTENT_LENGTH',0)))
content_length = int(META.get('HTTP_CONTENT_LENGTH', META.get('CONTENT_LENGTH', 0)))
except (ValueError, TypeError):
content_length = 0
@@ -178,7 +177,7 @@ class MultiPartParser(object):
content_type = meta_data.get('content-type', ('',))[0].strip()
try:
charset = meta_data.get('content-type', (0,{}))[1].get('charset', None)
charset = meta_data.get('content-type', (0, {}))[1].get('charset', None)
except:
charset = None