Merge cd4d482 into a1dacee

Knio · Sep 24, 2018 · 151d178 · 151d178
2 parents a1dacee + cd4d482
commit 151d178
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/dominate/dom_tag.py b/dominate/dom_tag.py
@@ -20,10 +20,17 @@
 
 import copy
 import numbers
-from collections import defaultdict, namedtuple, Callable
+from collections import defaultdict, namedtuple
 from functools import wraps
 import threading
 
+try:
+  # Python 3
+  from collections.abc import Callable
+except ImportError:
+  # Python 2.7
+  from collections import Callable
+
 try:
   basestring = basestring
 except NameError: # py3

diff --git a/dominate/util.py b/dominate/util.py
@@ -84,7 +84,7 @@ def unescape(data):
   '''
   unescapes html entities. the opposite of escape.
   '''
-  cc = re.compile('&(?:(?:#(\d+))|([^;]+));')
+  cc = re.compile(r'&(?:(?:#(\d+))|([^;]+));')
 
   result = []
   m = cc.search(data)