Merge branch '2and3'

1 files changed, 4 insertions, 3 deletions

diff --git a/markdown/extensions/__init__.py b/markdown/extensions/__init__.py
index 0222c91..960d8f9 100644
--- a/markdown/extensions/__init__.py
+++ b/markdown/extensions/__init__.py
@@ -1,9 +1,10 @@
+from __future__ import unicode_literals
 """
 Extensions
 -----------------------------------------------------------------------------
 """
 
-class Extension:
+class Extension(object):
     """ Base class for extensions to subclass. """
     def __init__(self, configs = {}):
         """Create an instance of an Extention.
@@ -46,6 +47,6 @@ class Extension:
         * md_globals: Global variables in the markdown module namespace.
 
         """
-        raise NotImplementedError, 'Extension "%s.%s" must define an "extendMarkdown"' \
-            'method.' % (self.__class__.__module__, self.__class__.__name__)
+        raise NotImplementedError('Extension "%s.%s" must define an "extendMarkdown"' \
+            'method.' % (self.__class__.__module__, self.__class__.__name__))