Merge conflicting changes from master

.gitignore

@@ -5,3 +5,4 @@ htmlcov
 dist
 docs/_build
 *.pyc
+.cache

.travis.yml

@@ -4,28 +4,51 @@ cache:
     - $HOME/.cache/pip
 
 language: python
-python: 2.7
-env:
-  - TOX_ENV=py26-threads
-  - TOX_ENV=py27-threads
-  - TOX_ENV=py33-threads
-  - TOX_ENV=py34-threads
-  - TOX_ENV=pypy-threads
-  - TOX_ENV=py26-greenlets
-  - TOX_ENV=py27-greenlets
-  - TOX_ENV=py33-greenlets
-  - TOX_ENV=py34-greenlets
-  - TOX_ENV=pypy-greenlets
-  - TOX_ENV=docs
-  - TOX_ENV=flake8-py2
-  - TOX_ENV=flake8-py3
-  - TOX_ENV=manifest
+
+
+matrix:
+  include:
+    - python: "2.6"  # these are just to make travis's UI a bit prettier
+      env: TOXENV=py26-threads
+    - python: "2.6"
+      env: TOXENV=py26-greenlets
+    - python: "2.7"
+      env: TOXENV=py27-threads
+    - python: "2.7"
+      env: TOXENV=py27-greenlets
+    - python: "3.3"
+      env: TOXENV=py33-threads
+    - python: "3.3"
+      env: TOXENV=py33-greenlets
+    - python: "3.4"
+      env: TOXENV=py34-threads
+    - python: "3.4"
+      env: TOXENV=py34-greenlets
+    - python: "3.5"
+      env: TOXENV=py35-threads
+    - python: "3.5"
+      env: TOXENV=py35-greenlets
+    - python: "pypy"
+      env: TOXENV=pypy-threads
+    - python: "pypy"
+      env: TOXENV=pypy-greenlets
+
+
+    # Meta
+    - python: "2.7"
+      env: TOXENV=flake8-py2
+    - python: "3.5"
+      env: TOXENV=flake8-py3
+    - python: "2.7"
+      env: TOXENV=manifest
+    - python: "2.7"
+      env: TOXENV=docs
 
 install:
   - pip install tox
 
 script:
-  - tox -e $TOX_ENV
+  - tox
 
 before_install:
   - pip install codecov

README.rst

@@ -26,6 +26,6 @@ It allows you to split your log entries up into key/value pairs and build them i
 
 It's dual-licensed under `Apache License, version 2 <http://choosealicense.com/licenses/apache/>`_ and `MIT <http://choosealicense.com/licenses/mit/>`_, available from `PyPI <https://pypi.python.org/pypi/structlog/>`_, the source code can be found on `GitHub <https://github.com/hynek/structlog>`_, the documentation at `http://www.structlog.org/ <http://www.structlog.org>`_.
 
-``structlog`` targets Python 2.6, 2.7, 3.3, 3.4, and PyPy with no additional dependencies for core functionality.
+``structlog`` targets Python 2.6, 2.7, 3.3 and newer, and PyPy with no additional dependencies for core functionality.
 
 If you need any help, visit us on ``#structlog`` on `Freenode <https://freenode.net>`_!

docs/changelog.rst

@@ -3,6 +3,7 @@ Changelog
 =========
 
 - :bug:`- major` Tolerate frames without a ``__name__``, better.
+- :feature:`-` Officially support Python 3.5.
 - :feature:`-` Add :func:`structlog.ReturnLogger.failure` and :func:`structlog.PrintLogger.failure` as preparation for the new Twisted logging system.
 - :release:`15.2.0 <2015-06-10>`
 - :bug:`- major` Allow empty lists of processors.

setup.py

@@ -70,6 +70,7 @@ def find_meta(meta):
             "Programming Language :: Python :: 3",
             "Programming Language :: Python :: 3.3",
             "Programming Language :: Python :: 3.4",
+            "Programming Language :: Python :: 3.5",
             "Programming Language :: Python",
             "Topic :: Software Development :: Libraries :: Python Modules",
         ],

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py33,py34,pypy}-{threads,greenlets}, flake8-{py2,py3}, docs, manifest
+envlist = {py26,py27,py33,py34,py35,pypy}-{threads,greenlets}, flake8-{py2,py3}, docs, manifest
 
 [testenv]
 deps =
@@ -24,7 +24,7 @@ commands =
     flake8 structlog tests setup.py
 
 [testenv:flake8-py3]
-basepython = py3: python3.4
+basepython = py3: python3.5
 deps = flake8
 commands =
     flake8 structlog tests setup.py