*Properly* detect Python < 3.3.

Change-Id: I259727d3204d4740ea9defb0c2adfdf59d81f3aa
This commit is contained in:
Ryan Petrello
2015-01-12 17:06:42 -05:00
parent efd3857e39
commit 67abf118f8

View File

@@ -5,7 +5,7 @@ import sys
import six import six
if sys.version_info > (3, 2): if sys.version_info >= (3, 3):
from importlib.machinery import SourceFileLoader from importlib.machinery import SourceFileLoader
else: else:
import imp import imp
@@ -166,7 +166,7 @@ def conf_from_file(filepath):
# This provides more verbose import-related error reporting than exec() # This provides more verbose import-related error reporting than exec()
absname, _ = os.path.splitext(abspath) absname, _ = os.path.splitext(abspath)
basepath, module_name = absname.rsplit(os.sep, 1) basepath, module_name = absname.rsplit(os.sep, 1)
if sys.version_info > (3, 2): if sys.version_info >= (3, 3):
SourceFileLoader(module_name, abspath).load_module(module_name) SourceFileLoader(module_name, abspath).load_module(module_name)
else: else:
imp.load_module( imp.load_module(