summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Merickel <github@m.merickel.org>2019-01-10 19:58:31 -0600
committerGitHub <noreply@github.com>2019-01-10 19:58:31 -0600
commit00a46e5529d39f5358119ce43d1d9dfa09b3b761 (patch)
treed556ed910aba7d793e70db9a4a5101855349d0d6 /src
parent4f626f7ebfd8703ed854973a5db6273c01064955 (diff)
parentafb06fd95cd225fc2aae06b710e3968a89d64353 (diff)
downloadpyramid-00a46e5529d39f5358119ce43d1d9dfa09b3b761.tar.gz
pyramid-00a46e5529d39f5358119ce43d1d9dfa09b3b761.tar.bz2
pyramid-00a46e5529d39f5358119ce43d1d9dfa09b3b761.zip
Merge pull request #3448 from mmerickel/drop-mimetypes-shim
drop mimetypes bugfix for 2.6.x that is no longer needed
Diffstat (limited to 'src')
-rw-r--r--src/pyramid/response.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/pyramid/response.py b/src/pyramid/response.py
index ea4677226..1ccf4fbdc 100644
--- a/src/pyramid/response.py
+++ b/src/pyramid/response.py
@@ -7,20 +7,6 @@ from webob import Response as _Response
from zope.interface import implementer
from pyramid.interfaces import IResponse, IResponseFactory
-
-def init_mimetypes(mimetypes):
- # this is a function so it can be unittested
- if hasattr(mimetypes, 'init'):
- mimetypes.init()
- return True
- return False
-
-
-# See http://bugs.python.org/issue5853 which is a recursion bug
-# that seems to effect Python 2.6, Python 2.6.1, and 2.6.2 (a fix
-# has been applied on the Python 2 trunk).
-init_mimetypes(mimetypes)
-
_BLOCK_SIZE = 4096 * 64 # 256K