Merge pull request #163 from sigmavirus24/fix-travis

Stop testing on py32 and fix pep8 errors

.travis.yml

@@ -6,8 +6,6 @@ matrix:
       env: TOXENV=py26
     - python: 2.7
       env: TOXENV=py27
-    - python: 3.2
-      env: TOXENV=py32
     - python: 3.3
       env: TOXENV=py33
     - python: 3.4

docs/conf.py

@@ -12,14 +12,14 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
-import os
+# import sys
+# import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 # sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath(os.pardir))
+# sys.path.insert(0, os.path.abspath(os.pardir))
 
 import twine
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py32,py33,py34,py35,docs,pep8
+envlist = py26,py27,pypy,py33,py34,py35,docs,pep8
 
 [testenv]
 deps =
@@ -10,10 +10,6 @@ commands =
     coverage run --source twine -m pytest {posargs:tests}
     coverage report -m
 
-[testenv:py32]
-commands =
-    py.test {posargs:tests}
-
 [testenv:docs]
 basepython = python2.7
 deps =

twine/utils.py

@@ -56,8 +56,8 @@ def get_config(path="~/.pypirc"):
     parser.read(path)
 
     # Get a list of repositories from the config file
-    if (parser.has_section("distutils")
-            and parser.has_option("distutils", "index-servers")):
+    if (parser.has_section("distutils") and
+            parser.has_option("distutils", "index-servers")):
         repositories = parser.get("distutils", "index-servers").split()
     else:
         repositories = ["pypi"]