Remove Python 2.6 support; bump dev version

Author: sloria

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 sudo: false
 python:
-    - "2.6"
     - "2.7"
     - "3.3"
     - "3.4"

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.12.0 (unreleased)
+-------------------
+
+Changes:
+
+- *Backwards-incompatible*: Remove Python 2.6 support.
+
 0.11.1 (2016-02-17)
 -------------------
 

CONTRIBUTING.rst

@@ -102,7 +102,7 @@ Pull Requests
 
 - If the pull request adds functionality, it is tested and the docs are updated.
 - If you've developed an extension, it is on the :ref:`Extensions List <extensions>`.
-- The pull request works on Python 2.6, 2.7, 3.3, 3.4, and PyPy. Use ``tox`` to verify that it does.
+- The pull request works on Python 2.7, 3.3, 3.4, 3.5, and PyPy. Use ``tox`` to verify that it does.
 - You've added yourself to ``AUTHORS.rst``.
 
 4. Submit a pull request to the ``sloria:dev`` branch.
@@ -126,7 +126,7 @@ To get test coverage reports (must have coverage installed): ::
 
     $ python run_tests.py cover
 
-To run tests on Python 2.6, 2.7, 3.3, and 3.4 virtual environments (must have each interpreter installed): ::
+To run tests on Python 2.7, 3.3, 3.4, and 3.5 virtual environments (must have each interpreter installed): ::
 
     $ tox
 

README.rst

@@ -87,7 +87,7 @@ Full documentation is available at https://textblob.readthedocs.org/.
 Requirements
 ------------
 
-- Python >= 2.6 or >= 3.3
+- Python >= 2.7 or >= 3.3
 
 Project Links
 -------------

docs/install.rst

@@ -86,7 +86,7 @@ Old:
 Python
 ++++++
 
-TextBlob supports Python >=2.6 or >=3.3.
+TextBlob supports Python >=2.7 or >=3.3.
 
 
 Dependencies

run_tests.py

@@ -34,9 +34,6 @@ def get_argv():
         return args
     if "cover" in sys.argv:
         args += ["--with-coverage", "--cover-html"]
-    if PY26:
-        # Exclude tests that don't work on python2.6
-        attr_conditions.append("not py27_only")
     try:
         __import__('numpy')
     except ImportError:

setup.py

@@ -53,7 +53,6 @@ def read(fname):
         'Natural Language :: English',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',

textblob/__init__.py

@@ -1,6 +1,6 @@
 import os
 
-__version__ = '0.11.1'
+__version__ = '0.12.0.dev0'
 __license__ = 'MIT'
 __author__ = 'Steven Loria'
 

textblob/compat.py

@@ -2,7 +2,6 @@
 import sys
 
 PY2 = int(sys.version[0]) == 2
-PY26 = PY2 and int(sys.version_info[1]) < 7
 
 if PY2:
     from itertools import imap, izip
@@ -17,10 +16,6 @@
     imap = imap
     izip = izip
     import unicodecsv as csv
-    if PY26:
-        from .ordereddict import OrderedDict
-    else:
-        from collections import OrderedDict
 
     def implements_to_string(cls):
         """Class decorator that renames __str__ to __unicode__ and
@@ -29,7 +24,7 @@ def implements_to_string(cls):
         cls.__unicode__ = cls.__str__
         cls.__str__ = lambda x: x.__unicode__().encode('utf-8')
         return cls
-else: # PY3
+else:  # PY3
     from urllib import request
     from urllib.parse import quote as urlquote
     from urllib.parse import urlencode
@@ -41,7 +36,6 @@ def implements_to_string(cls):
     imap = map
     izip = zip
     import csv
-    from collections import OrderedDict
 
     implements_to_string = lambda x: x
 

textblob/formats.py

@@ -19,11 +19,12 @@ class PipeDelimitedFormat(formats.DelimitedFormat):
     with open('training_data.psv', 'r') as fp:
         cl = NaiveBayesAnalyzer(fp, format='psv')
 """
-
 from __future__ import absolute_import
-from textblob.compat import PY2, csv, OrderedDict
-from textblob.utils import is_filelike
 import json
+from collections import OrderedDict
+
+from textblob.compat import PY2, csv
+from textblob.utils import is_filelike
 
 DEFAULT_ENCODING = 'utf-8'