From 21acb716420c79b7c229a3630c19bfabd3a3b3b0 Mon Sep 17 00:00:00 2001 From: medmunds Date: Mon, 4 Mar 2013 21:13:19 -0800 Subject: [PATCH] Unified version: Python 3-compatible replacement for execfile --- docs/conf.py | 6 +++++- setup.py | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index fe3bb3c..afdfb74 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,11 @@ import sys, os # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.insert(0, os.path.abspath('..')) -execfile('../djrill/_version.py') +# define __version__ and __minor_version__ from ../djrill/_version.py, +# but without importing from djrill (which would make docs dependent on Django, etc.) +with open("../djrill/_version.py") as f: + code = compile(f.read(), "../djrill/_version.py", 'exec') + exec(code) # -- General configuration ----------------------------------------------------- diff --git a/setup.py b/setup.py index 3e6fc3a..b29c789 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,11 @@ from setuptools import setup import re -execfile('djrill/_version.py') # defines __version__, __minor_version__ + +# define __version__ and __minor_version__ from djrill/_version.py, +# but without importing from djrill (which would break setup) +with open("djrill/_version.py") as f: + code = compile(f.read(), "djrill/_version.py", 'exec') + exec(code) def long_description_from_readme(rst):