Merge pull request #91 from asottile/fspath

Add support for __fspath__ (py36)

.travis.yml

@@ -1,14 +1,16 @@
 language: python
-env:
-- TOX_ENV=py26
-- TOX_ENV=py27
-- TOX_ENV=py33
-- TOX_ENV=py34
-- TOX_ENV=pypy
-- TOX_ENV=docs
-- TOX_ENV=coverage
-
-install:
-    - pip install tox coveralls
-script: tox -e $TOX_ENV
+matrix:
+  include:
+    - env: TOXENV=py26
+    - env: TOXENV=py27
+    - env: TOXENV=py34
+    - env: TOXENV=py35
+      python: 3.5
+    - env: TOXENV=py36
+      python: 3.6
+    - env: TOXENV=pypy
+    - env: TOXENV=docs
+    - env: TOXENV=coverage
+install: pip install tox coveralls
+script: tox
 after_success: coveralls

setup.py

@@ -21,6 +21,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: Apache Software License",
         "Intended Audience :: Developers",

staticconf/proxy.py

@@ -36,13 +36,18 @@ def __repr__(self):
     '__rmul__', '__ror__', '__rpow__', '__rrshift__', '__rshift__', '__rsub__',
     '__rtruediv__', '__rxor__', '__setitem__', '__setslice__', '__sub__',
     '__truediv__', '__xor__', 'next', '__nonzero__', '__str__', '__unicode__',
-    '__index__',
+    '__index__', '__fspath__',
 ]
 
 
+def identity(x):
+    return x
+
+
 unary_funcs = {
     '__unicode__':  six.text_type,
     '__str__':      str,
+    '__fspath__':   identity,  # python3.6+ os.PathLike interface
     '__repr__':     repr,
     '__nonzero__':  bool,  # Python2 bool
     '__bool__':     bool,  # Python3 bool

tests/proxy_test.py

@@ -1,4 +1,5 @@
 import datetime
+import os.path
 
 import pytest
 
@@ -79,6 +80,7 @@ def test_proxy_with_string(self):
         assert_equal(value_proxy, 'one%s')
         assert value_proxy < 'two'
         assert value_proxy > 'ab'
+        assert os.path.join(value_proxy, 'a') == os.path.join('one%s', 'a')
         assert_equal(value_proxy + '!', 'one%s!')
         assert_equal(value_proxy % '!', 'one!')
         assert_equal(repr(value_proxy), "'one%s'")

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py34,py35,pypy,docs,coverage
+envlist = py26,py27,py34,py35,py36,pypy,docs,coverage
 
 [testenv]
 deps =