From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 20 May 2013 16:06:41 +0000 (+0100)
Subject: Removed some no longer needed code from compat
X-Git-Tag: 2.8~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f15b814dcba6aa12bc74d1f7d0c881d55f7126be;p=thirdparty%2Fjinja.git

Removed some no longer needed code from compat
---

diff --git a/jinja2/_compat.py b/jinja2/_compat.py
index f376777c..1326cbc6 100644
--- a/jinja2/_compat.py
+++ b/jinja2/_compat.py
@@ -103,23 +103,7 @@ def with_metaclass(meta, *bases):
     return metaclass('temporary_class', None, {})
 
 
-try:
-    from collections import Mapping as mapping_types
-except ImportError:
-    import UserDict
-    mapping_types = (UserDict.UserDict, UserDict.DictMixin, dict)
-
-
 try:
     from urllib.parse import quote_from_bytes as url_quote
 except ImportError:
     from urllib import quote as url_quote
-
-
-try:
-    from thread import allocate_lock
-except ImportError:
-    try:
-        from threading import Lock as allocate_lock
-    except ImportError:
-        from dummy_thread import allocate_lock
diff --git a/jinja2/tests.py b/jinja2/tests.py
index 48a3e061..87b31201 100644
--- a/jinja2/tests.py
+++ b/jinja2/tests.py
@@ -9,8 +9,9 @@
     :license: BSD, see LICENSE for more details.
 """
 import re
+from collections import Mapping
 from jinja2.runtime import Undefined
-from jinja2._compat import text_type, string_types, mapping_types
+from jinja2._compat import text_type, string_types
 
 
 number_re = re.compile(r'^-?\d+(\.\d+)?$')
@@ -82,7 +83,7 @@ def test_mapping(value):
 
     .. versionadded:: 2.6
     """
-    return isinstance(value, mapping_types)
+    return isinstance(value, Mapping)
 
 
 def test_number(value):
diff --git a/jinja2/utils.py b/jinja2/utils.py
index ddc47da0..1c717899 100644
--- a/jinja2/utils.py
+++ b/jinja2/utils.py
@@ -11,8 +11,9 @@
 import re
 import errno
 from collections import deque
+from threading import Lock
 from jinja2._compat import text_type, string_types, implements_iterator, \
-     allocate_lock, url_quote
+     url_quote
 
 
 _word_split_re = re.compile(r'(\s+)')
@@ -309,7 +310,7 @@ class LRUCache(object):
         self._popleft = self._queue.popleft
         self._pop = self._queue.pop
         self._remove = self._queue.remove
-        self._wlock = allocate_lock()
+        self._wlock = Lock()
         self._append = self._queue.append
 
     def __getstate__(self):