Commit 864747fc authored by Leo Pound Singer's avatar Leo Pound Singer

Update from Astropy package template

parent b61b608d
......@@ -37,10 +37,7 @@ except ImportError:
sys.exit(1)
# Get configuration information from setup.cfg
try:
from ConfigParser import ConfigParser
except ImportError:
from configparser import ConfigParser
from configparser import ConfigParser
conf = ConfigParser()
conf.read([os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')])
......
......@@ -7,11 +7,8 @@ __all__ = ['__version__', '__githash__']
try:
_ASTROPY_SETUP_
except NameError:
from sys import version_info
if version_info[0] >= 3:
import builtins
else:
import __builtin__ as builtins
import builtins
builtins._ASTROPY_SETUP_ = False
try:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment