Merge #121

decouple.py

@@ -8,15 +8,22 @@
 from distutils.util import strtobool
 
 # Useful for very coarse version differentiation.
-PY3 = sys.version_info[0] == 3
+PYVERSION = sys.version_info
 
-if PY3:
+
+if PYVERSION >= (3, 0, 0):
     from configparser import ConfigParser
     text_type = str
 else:
     from ConfigParser import SafeConfigParser as ConfigParser
     text_type = unicode
 
+if PYVERSION >= (3, 2, 0):
+    read_config = lambda parser, file: parser.read_file(file)
+else:
+    read_config = lambda parser, file: parser.readfp(file)
+
+
 DEFAULT_ENCODING = 'UTF-8'
 
 class UndefinedValueError(Exception):
@@ -103,8 +110,7 @@ class RepositoryIni(RepositoryEmpty):
     def __init__(self, source, encoding=DEFAULT_ENCODING):
         self.parser = ConfigParser()
         with open(source, encoding=encoding) as file_:
-            config_reader = self.parser.read_file if sys.version_info >= (3, 2, 0) else self.parser.readfp
-            config_reader(file_)
+            read_config(self.parser, file_)
 
     def __contains__(self, key):
         return (key in os.environ or

tests/test_autoconfig.py

@@ -2,7 +2,7 @@
 import os
 import pytest
 from mock import patch, mock_open
-from decouple import AutoConfig, UndefinedValueError, RepositoryEmpty, DEFAULT_ENCODING, PY3
+from decouple import AutoConfig, UndefinedValueError, RepositoryEmpty, DEFAULT_ENCODING
 
 
 def test_autoconfig_env():

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py37
+envlist = py2, py3
 
 [testenv]
 deps =