Drop support for EOL Python 2.6

.travis.yml

@@ -10,7 +10,6 @@ python:
   - "3.4"
   - "3.3"
   - "2.7"
-  - "2.6"
 matrix:
   allow_failures:
     - python: nightly

README.rst

@@ -25,8 +25,8 @@ TinyDB is:
   e.g. `PyMongo <http://api.mongodb.org/python/current/>`_) nor any dependencies
   from PyPI.
 
-- **works on Python 2.6 + 2.7 and 3.3 – 3.6 and PyPy:** TinyDB works on all
-  modern versions of Python and PyPy.
+- **works on Python 2.7 and 3.3 – 3.6 and PyPy:** TinyDB works on all modern
+  versions of Python and PyPy.
 
 - **powerfully extensible:** You can easily extend TinyDB by writing new
   storages or modify the behaviour of storages with Middlewares.
@@ -93,7 +93,7 @@ Using Middlewares
 Supported Python Versions
 *************************
 
-TinyDB has been tested with Python 2.6, 2.7, 3.3 - 3.5 and PyPy.
+TinyDB has been tested with Python 2.7, 3.3 - 3.6 and PyPy.
 
 
 Extensions

setup.py

@@ -1,5 +1,4 @@
 # coding=utf-8
-from distutils.util import convert_path
 from setuptools import setup, find_packages
 from codecs import open
 import os
@@ -36,12 +35,14 @@ def read(fname):
         "Topic :: Database",
         "Topic :: Database :: Database Engines/Servers",
         "Topic :: Utilities",
-        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Operating System :: OS Independent"
     ],

tests/test_tables.py

@@ -7,7 +7,7 @@ def test_tables_list(db):
     db.table('table1')
     db.table('table2')
 
-    assert db.tables() == set(['_default', 'table1', 'table2'])
+    assert db.tables() == {'_default', 'table1', 'table2'}
 
 
 def test_one_table(db):

tests/test_tinydb.py

@@ -406,7 +406,7 @@ def test_insert_string(tmpdir):
             _db.insert([1, 2, 3])  # Fails
 
         with pytest.raises(ValueError):
-            _db.insert(set(['bark']))  # Fails
+            _db.insert({'bark'})  # Fails
 
         assert data == _db.all()
 
@@ -421,7 +421,7 @@ def test_insert_invalid_dict(tmpdir):
         _db.insert_multiple(data)
 
         with pytest.raises(TypeError):
-            _db.insert({'int': set(['bark'])})  # Fails
+            _db.insert({'int': {'bark'}})  # Fails
 
         assert data == _db.all()
 
@@ -445,14 +445,14 @@ def test_non_default_table():
     assert [TinyDB.DEFAULT_TABLE] == list(db.tables())
 
     db = TinyDB(storage=MemoryStorage, default_table='non-default')
-    assert set(['non-default']) == db.tables()
+    assert {'non-default'} == db.tables()
 
     db.purge_tables()
     default_table = TinyDB.DEFAULT_TABLE
 
     TinyDB.DEFAULT_TABLE = 'non-default'
     db = TinyDB(storage=MemoryStorage)
-    assert set(['non-default']) == db.tables()
+    assert {'non-default'} == db.tables()
 
     TinyDB.DEFAULT_TABLE = default_table
 
@@ -467,14 +467,14 @@ def test_purge_table():
     table_name = 'some-other-table'
     db = TinyDB(storage=MemoryStorage)
     db.table(table_name)
-    assert set([TinyDB.DEFAULT_TABLE, table_name]) == db.tables()
+    assert {TinyDB.DEFAULT_TABLE, table_name} == db.tables()
 
     db.purge_table(table_name)
-    assert set([TinyDB.DEFAULT_TABLE]) == db.tables()
+    assert {TinyDB.DEFAULT_TABLE} == db.tables()
     assert table_name not in db._table_cache
 
     db.purge_table('non-existent-table-name')
-    assert set([TinyDB.DEFAULT_TABLE]) == db.tables()
+    assert {TinyDB.DEFAULT_TABLE} == db.tables()
 
 
 def test_empty_write(tmpdir):

tests/test_utils.py

@@ -109,7 +109,7 @@ class MyWarning(Warning):
 
 
 def test_freeze():
-    frozen = freeze([0, 1, 2, {'a': [1, 2, 3]}, set([1, 2])])
+    frozen = freeze([0, 1, 2, {'a': [1, 2, 3]}, {1, 2}])
     assert isinstance(frozen, tuple)
     assert isinstance(frozen[3], FrozenDict)
     assert isinstance(frozen[3]['a'], tuple)

tinydb/queries.py

@@ -48,7 +48,7 @@ def __hash__(self):
         return hash(self.hashval)
 
     def __repr__(self):
-        return 'QueryImpl{0}'.format(self.hashval)
+        return 'QueryImpl{}'.format(self.hashval)
 
     def __eq__(self, other):
         return self.hashval == other.hashval