Removed support for Python 2.6 as requested in cookiecutter#201

.travis.yml

@@ -3,7 +3,6 @@
 language: python
 python: 2.7
 env:
-    - TOX_ENV=py26
     - TOX_ENV=py27
     - TOX_ENV=py33
     - TOX_ENV=py34

cookiecutter/generate.py

@@ -8,17 +8,18 @@
 Functions for generating a project from a project template.
 """
 from __future__ import unicode_literals
+from collections import OrderedDict
+import io
+import json
 import logging
 import os
-import io
 import shutil
 
 from jinja2 import FileSystemLoader, Template
 from jinja2.environment import Environment
 from jinja2.exceptions import TemplateSyntaxError
 from binaryornot.check import is_binary
 
-from .compat import json, OrderedDict
 from .exceptions import NonTemplatedInputDirException
 from .find import find_template
 from .utils import make_sure_path_exists, work_in

setup.py

@@ -62,7 +62,6 @@
         'License :: OSI Approved :: BSD License',
         '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.3',

tests/__init__.py

@@ -10,7 +10,7 @@
 
 import os
 import shutil
-from cookiecutter.compat import unittest
+import unittest
 from cookiecutter import utils
 
 

tests/test_compat.py

@@ -8,7 +8,8 @@
 Tests for `cookiecutter.compat` module.
 """
 
-from cookiecutter.compat import unittest, which
+import unittest
+from cookiecutter.compat import which
 
 
 class TestWhich(unittest.TestCase):

tests/test_config.py

@@ -10,8 +10,8 @@
 
 import os
 import shutil
+import unittest
 
-from cookiecutter.compat import unittest
 from cookiecutter import config
 from cookiecutter.exceptions import ConfigDoesNotExistException, InvalidConfiguration
 

tests/test_main.py

@@ -10,8 +10,9 @@
 
 import logging
 import os
+import unittest
 
-from cookiecutter.compat import patch, unittest
+from cookiecutter.compat import patch
 from cookiecutter import main, utils
 from tests import CookiecutterCleanSystemTestCase
 

tests/test_prompt.py

@@ -8,10 +8,12 @@
 Tests for `cookiecutter.prompt` module.
 """
 
+from collections import OrderedDict
 import platform
 import sys
+import unittest
 
-from cookiecutter.compat import patch, unittest, OrderedDict
+from cookiecutter.compat import patch
 from cookiecutter import prompt
 
 if 'windows' in platform.platform().lower():

tests/test_vcs.py

@@ -12,8 +12,9 @@
 import logging
 import os
 import subprocess
+import unittest
 
-from cookiecutter.compat import patch, unittest
+from cookiecutter.compat import patch
 from cookiecutter import exceptions, utils, vcs
 
 try:

tox.ini

@@ -1,19 +1,11 @@
 [tox]
-envlist = py26, py27, py33, py34, pypy, flake8
+envlist = py27, py33, py34, pypy, flake8
 
 [testenv]
 commands = py.test --cov cookiecutter tests {posargs}
 deps = pytest
        pytest-cov
 
-[testenv:py26]
-deps =
-    {[testenv]deps}
-    mock
-    unittest2
-    ordereddict
-    simplejson>2.1
-
 [testenv:py27]
 deps =
     {[testenv]deps}
@@ -24,7 +16,7 @@ deps =
     {[testenv]deps}
     mock
 
-[testenv:flake8]        
+[testenv:flake8]
 deps =
     flake8
 commands =