Commit df831fea authored by Ezio Melotti's avatar Ezio Melotti

Merged revisions 79558 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79558 | florent.xicluna | 2010-04-01 21:17:09 +0300 (Thu, 01 Apr 2010) | 2 lines

  #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
parent dd1e83e8
......@@ -676,7 +676,7 @@ class build_ext (Command):
# extensions in debug_mode are named 'module_d.pyd' under windows
so_ext = get_config_var('SO')
if os.name == 'nt' and self.debug:
return apply(os.path.join, ext_path) + '_d' + so_ext
return os.path.join(*ext_path) + '_d' + so_ext
return os.path.join(*ext_path) + so_ext
def get_export_symbols (self, ext):
......
......@@ -205,7 +205,7 @@ def convert_path (pathname):
paths.remove('.')
if not paths:
return os.curdir
return apply(os.path.join, paths)
return os.path.join(*paths)
# convert_path ()
......
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