Merge a2de843 into 3cfa02a

.travis.yml

@@ -1,5 +1,6 @@
 language: python
 env:
+  - TOXENV=py26
   - TOXENV=py27
   - TOXENV=py32
   - TOXENV=py33

markdown/__init__.py

@@ -50,7 +50,11 @@
 __all__ = ['Markdown', 'markdown', 'markdownFromFile']
 
 logger = logging.getLogger('MARKDOWN')
-logging.captureWarnings(True)
+try:
+    logging.captureWarnings(True)
+except AttributeError:
+    # E.g.: Python 2.6 doesn't have logging.captureWarnings
+    pass
 
 
 class Markdown(object):

setup.py

@@ -12,6 +12,15 @@
 import imp
 
 
+install_requires = []
+
+try:
+    import importlib  # noqa
+except ImportError:
+    # E.g.: Python 2.6
+    install_requires.append('importlib')
+
+
 def get_version():
     " Get version & version_info without importing markdown.__init__ "
     path = os.path.join(os.path.dirname(__file__), 'markdown')
@@ -243,6 +252,7 @@ def has_docs(self):
     maintainer='Waylan Limberg',
     maintainer_email='waylan.limberg [at] icloud.com',
     license='BSD License',
+    install_requires=install_requires,
     packages=['markdown', 'markdown.extensions'],
     scripts=['bin/%s' % SCRIPT_NAME],
     cmdclass={
@@ -256,6 +266,7 @@ def has_docs(self):
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py32, py33, py34, pypy, flake8
+envlist = py26, py27, py32, py33, py34, pypy, flake8
 
 [testenv]
 downloadcache = {toxworkdir}/cache
@@ -12,4 +12,4 @@ deps = flake8
 commands = flake8 {toxinidir}/markdown {toxinidir}/tests {toxinidir}/setup.py {toxinidir}/run-tests.py
 
 [flake8]
-max-line-length = 119
+max-line-length = 119