Merge branch 'py3'

Author: agjohnson

.gitignore

@@ -4,4 +4,5 @@ _build
 _readthedocs_build
 autoapi
 _build_rtd
-/.tox/
+.tox
+dist

.travis.yml

@@ -1,16 +1,14 @@
 language: python
 python:
   - 2.7
+  - 3.4
+  - 3.5
+  - 3.6
 sudo: false
-env:
-  - TOX_ENV=py27-unittest
-  - TOX_ENV=py27-integration
-  - TOX_ENV=lint
-  #- TOX_ENV=docs
 install:
-  - pip install tox
+  - pip install tox-travis
 script:
-  - tox -e $TOX_ENV
+  - tox
 notifications:
   slack:
     rooms:

readthedocs_build/config/config.py

@@ -93,7 +93,8 @@ def error(self, key, message, code):
         raise InvalidConfig(
             key=key,
             code=code,
-            error_message='{source}: {message}'.format(source=source, message=message),
+            error_message='{source}: {message}'.format(source=source,
+                                                       message=message),
             source_file=self.source_file,
             source_position=self.source_position)
 
@@ -105,7 +106,7 @@ def catch_validation_error(self, key):
             raise InvalidConfig(
                 key=key,
                 code=error.code,
-                error_message=error.message,
+                error_message=str(error),
                 source_file=self.source_file,
                 source_position=self.source_position)
 
@@ -375,7 +376,7 @@ def load(path, env_config):
                 raise ConfigError(
                     'Parse error in {filename}: {message}'.format(
                         filename=filename,
-                        message=error.message),
+                        message=str(error)),
                     code=CONFIG_SYNTAX_INVALID)
             for i, config in enumerate(configs):
                 build_config = BuildConfig(

readthedocs_build/config/test_validation.py

@@ -2,6 +2,7 @@
 from mock import patch
 from pytest import raises
 import os
+from six import text_type
 
 from .validation import validate_bool
 from .validation import validate_choice
@@ -85,7 +86,7 @@ def describe_validate_directory():
     def it_uses_validate_path(tmpdir):
         patcher = patch('readthedocs_build.config.validation.validate_path')
         with patcher as validate_path:
-            path = unicode(tmpdir.mkdir('a directory'))
+            path = text_type(tmpdir.mkdir('a directory'))
             validate_path.return_value = path
             validate_directory(path, str(tmpdir))
             validate_path.assert_called_with(path, str(tmpdir))
@@ -150,11 +151,11 @@ def describe_validate_string():
 
     def it_accepts_unicode():
         result = validate_string(u'Unicöde')
-        assert isinstance(result, unicode)
+        assert isinstance(result, text_type)
 
     def it_accepts_nonunicode():
         result = validate_string('Unicode')
-        assert isinstance(result, unicode)
+        assert isinstance(result, text_type)
 
     def it_rejects_float():
         with raises(ValidationError) as excinfo:

readthedocs_build/config/validation.py

@@ -1,4 +1,5 @@
 import os
+from six import string_types, text_type
 
 
 INVALID_BOOL = 'invalid-bool'
@@ -80,6 +81,6 @@ def validate_path(value, base_path):
 
 
 def validate_string(value):
-    if not isinstance(value, basestring):
+    if not isinstance(value, string_types):
         raise ValidationError(value, INVALID_STRING)
-    return unicode(value)
+    return text_type(value)

setup.py

@@ -23,6 +23,8 @@
         "recommonmark",
         "click>=4.0",
         "virtualenv",
+        "six",
+        "mock"
     ],
     entry_points={
         'console_scripts': [

tox.ini

@@ -1,10 +1,16 @@
 [tox]
 envlist =
-    py27-unittest,
-    py27-integration
+    py{27,34,35,36}-unittest,
+    py{27,34,35,36}-integration
     lint
     # docs
 
+[tox:travis]
+2.7 = py27-unittest, py27-integration, lint
+3.4 = py34-unittest, py34-integration
+3.5 = py35-unittest, py35-integration
+3.6 = py36-unittest, py36-integration
+
 [testenv]
 deps =
     -r{toxinidir}/requirements/tests.txt