Commit 0d37c617 authored by Jason R. Coombs's avatar Jason R. Coombs Committed by GitHub

Merge pull request #639 from stepshal/block-comment

Format block comments.
parents 0fc24e1a f1e3a3fc
...@@ -10,7 +10,7 @@ def __boot(): ...@@ -10,7 +10,7 @@ def __boot():
pic = getattr(sys, 'path_importer_cache', {}) pic = getattr(sys, 'path_importer_cache', {})
stdpath = sys.path[len(PYTHONPATH):] stdpath = sys.path[len(PYTHONPATH):]
mydir = os.path.dirname(__file__) mydir = os.path.dirname(__file__)
#print "searching",stdpath,sys.path # print "searching",stdpath,sys.path
for item in stdpath: for item in stdpath:
if item==mydir or not item: if item==mydir or not item:
...@@ -39,7 +39,7 @@ def __boot(): ...@@ -39,7 +39,7 @@ def __boot():
else: else:
raise ImportError("Couldn't find the real 'site' module") raise ImportError("Couldn't find the real 'site' module")
#print "loaded", __file__ # print "loaded", __file__
known_paths = dict([(makepath(item)[1], 1) for item in sys.path]) # 2.2 comp known_paths = dict([(makepath(item)[1], 1) for item in sys.path]) # 2.2 comp
......
...@@ -25,11 +25,11 @@ def run_setup_py(cmd, pypath=None, path=None, ...@@ -25,11 +25,11 @@ def run_setup_py(cmd, pypath=None, path=None,
for envname in os.environ: for envname in os.environ:
env[envname] = os.environ[envname] env[envname] = os.environ[envname]
#override the python path if needed # override the python path if needed
if pypath is not None: if pypath is not None:
env["PYTHONPATH"] = pypath env["PYTHONPATH"] = pypath
#overide the execution path if needed # overide the execution path if needed
if path is not None: if path is not None:
env["PATH"] = path env["PATH"] = path
if not env.get("PATH", ""): if not env.get("PATH", ""):
...@@ -50,11 +50,11 @@ def run_setup_py(cmd, pypath=None, path=None, ...@@ -50,11 +50,11 @@ def run_setup_py(cmd, pypath=None, path=None,
except OSError: except OSError:
return 1, '' return 1, ''
#decode the console string if needed # decode the console string if needed
if hasattr(data, "decode"): if hasattr(data, "decode"):
# use the default encoding # use the default encoding
data = data.decode() data = data.decode()
data = unicodedata.normalize('NFC', data) data = unicodedata.normalize('NFC', data)
#communciate calls wait() # communciate calls wait()
return proc.returncode, data return proc.returncode, data
...@@ -26,6 +26,6 @@ def test_directories_in_package_data_glob(tmpdir_as_cwd): ...@@ -26,6 +26,6 @@ def test_directories_in_package_data_glob(tmpdir_as_cwd):
package_data={'': ['path/*']}, package_data={'': ['path/*']},
)) ))
os.makedirs('path/subpath') os.makedirs('path/subpath')
#with contexts.quiet(): # with contexts.quiet():
dist.parse_command_line() dist.parse_command_line()
dist.run_commands() dist.run_commands()
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