Commit 70b12706 authored by Vinay Sajip's avatar Vinay Sajip

logging: added hasHandlers() to LoggerAdapter.

parent ebefff18
......@@ -56,6 +56,18 @@ def get_python_version():
"""
return sys.version[:3]
def _get_build_dir(name, plat_specific):
# Assume the executable is in the build directory. The
# pyconfig.h file should be in the same directory. Since
# the build directory may not be the source directory, we
# must use "srcdir" from the makefile to find the "Include"
# directory.
base = os.path.dirname(os.path.abspath(sys.executable))
if plat_specific:
return base
else:
thedir = os.path.join(get_config_var('srcdir'), name)
return os.path.normpath(thedir)
def get_python_inc(plat_specific=0, prefix=None):
"""Return the directory containing installed Python header files.
......@@ -72,17 +84,7 @@ def get_python_inc(plat_specific=0, prefix=None):
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
if python_build:
# Assume the executable is in the build directory. The
# pyconfig.h file should be in the same directory. Since
# the build directory may not be the source directory, we
# must use "srcdir" from the makefile to find the "Include"
# directory.
base = os.path.dirname(os.path.abspath(sys.executable))
if plat_specific:
return base
else:
incdir = os.path.join(get_config_var('srcdir'), 'Include')
return os.path.normpath(incdir)
return _get_build_dir('Include', plat_specific)
return os.path.join(prefix, "include", "python" + get_python_version())
elif os.name == "nt":
return os.path.join(prefix, "include")
......@@ -117,6 +119,8 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
if python_build:
return _get_build_dir('Lib', plat_specific)
libpython = os.path.join(prefix,
"lib", "python" + get_python_version())
if standard_lib:
......
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