Skip to content

Commit

Permalink
Merge pull request #62 from bsipocz/configparser_import_fix
Browse files Browse the repository at this point in the history
Fixing configparser imports for python 3.5.2
  • Loading branch information
sosey committed Jul 2, 2016
2 parents a980098 + a92f1b5 commit d85e6bd
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@
from astropy.extern import six

# Get configuration information from setup.cfg
from distutils import config
conf = config.ConfigParser()
try:
from ConfigParser import ConfigParser
except ImportError:
from configparser import ConfigParser
conf = ConfigParser()
conf.read([os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')])
setup_cfg = dict(conf.items('metadata'))

Expand Down

0 comments on commit d85e6bd

Please sign in to comment.