fix rebase problems and make it work nice with current master

.travis.yml

@@ -1,23 +1,7 @@
 language: python
 sudo: false
-<<<<<<< HEAD
-python:
-    - 2.7
-    - 3.4
-    - 3.5
-    - 3.6
-env:
-    - ENVIRON=py
-    - ENVIRON=py27-datetime,py36-datetime
-    - ENVIRON=isort,flake8,docs
-matrix:
-    exclude:
-        - env: ENVIRON=isort,flake8,docs
-        - env: ENVIRON=py27-datetime,py36-datetime
-=======
 
 matrix:
->>>>>>> adjust travis-ci config to reflect new tox settings
     include:
         - python: "2.7"
           env: TOXENV=docs,lint-py2
@@ -26,11 +10,6 @@ matrix:
         - python: "2.7"
           env: TOXENV=py27
         - python: "2.7"
-          env: TOXENV=py27-rp3
-        - python: "2.7"
-<<<<<<< HEAD
-          env: ENVIRON=py27-datetime
-=======
           env: TOXENV=py27-datetime
         - python: "3.4"
           env: TOXENV=py34
@@ -54,7 +33,6 @@ matrix:
         - python: "pypy3"
           env: TOXENV=pypy
 
->>>>>>> adjust travis-ci config to reflect new tox settings
 install:
     - travis_retry pip install -U pip setuptools
     - travis_retry pip install -U -c constraints.txt tox coveralls coverage

src/RestrictedPython/_compat.py

@@ -8,6 +8,6 @@
 IS_PY35_OR_GREATER = _version.major == 3 and _version.minor >= 5
 
 if IS_PY2:
-    basestring = basestring
+    basestring = basestring  # NOQA: F821  # Python 2 only built-in function
 else:
     basestring = str

tox.ini

@@ -49,19 +49,6 @@ deps =
     {[testenv]deps}
     DateTime
 
-<<<<<<< HEAD
-=======
-[testenv:py27-rp3]
-basepython = python2.7
-commands =
-    coverage run {envbindir}/zope-testrunner --path=src/RestrictedPython --all -v {posargs}
-deps =
-    -cconstraints.txt
-    .[test]
-    zope.testrunner
-    coverage
-
->>>>>>> Modification in tox.ini
 [testenv:coverage]
 basepython = python2.7
 skip_install = true
@@ -139,14 +126,15 @@ commands = {[lint]commands}
 whitelist_externals = {[lint]whitelist_externals}
 
 [testenv:docs]
-basepython = python2.7
-commands =
-    sphinx-build -b html -d build/docs/doctrees docs build/docs/html
-    sphinx-build -b doctest docs build/docs/doctrees
 deps =
     -cconstraints.txt
     Sphinx
 
+commands =
+    python -V
+    sphinx-build -b html -d build/docs/doctrees docs build/docs/html
+    sphinx-build -b doctest docs build/docs/doctrees
+
 [testenv:release]
 skip_install = true
 basepython = python2.7