You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

78 lines
2.8 KiB

Merged revisions 59541-59561 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r59544 | raymond.hettinger | 2007-12-18 01:13:45 +0100 (Tue, 18 Dec 2007) | 1 line Add more namedtuple() test cases. Neaten the code and comments. ........ r59545 | christian.heimes | 2007-12-18 04:38:03 +0100 (Tue, 18 Dec 2007) | 3 lines Fixed for #1601: IDLE not working correctly on Windows (Py30a2/IDLE30a1) Amaury's ideas works great. Should we build the Python core with WINVER=0x0500 and _WIN32_WINNT=0x0500, too? ........ r59546 | christian.heimes | 2007-12-18 10:00:13 +0100 (Tue, 18 Dec 2007) | 1 line Make it a bit easier to test Tcl/Tk and idle from a build dir. ........ r59547 | christian.heimes | 2007-12-18 10:12:10 +0100 (Tue, 18 Dec 2007) | 1 line Removed several unused files from the PCbuild9 directory. They are relics from the past. ........ r59548 | raymond.hettinger | 2007-12-18 19:26:18 +0100 (Tue, 18 Dec 2007) | 29 lines Speed-up dictionary constructor by about 10%. New opcode, STORE_MAP saves the compiler from awkward stack manipulations and specializes for dicts using PyDict_SetItem instead of PyObject_SetItem. Old disassembly: 0 BUILD_MAP 0 3 DUP_TOP 4 LOAD_CONST 1 (1) 7 ROT_TWO 8 LOAD_CONST 2 ('x') 11 STORE_SUBSCR 12 DUP_TOP 13 LOAD_CONST 3 (2) 16 ROT_TWO 17 LOAD_CONST 4 ('y') 20 STORE_SUBSCR New disassembly: 0 BUILD_MAP 0 3 LOAD_CONST 1 (1) 6 LOAD_CONST 2 ('x') 9 STORE_MAP 10 LOAD_CONST 3 (2) 13 LOAD_CONST 4 ('y') 16 STORE_MAP ........ r59549 | thomas.heller | 2007-12-18 20:00:34 +0100 (Tue, 18 Dec 2007) | 2 lines Issue #1642: Fix segfault in ctypes when trying to delete attributes. ........ r59551 | guido.van.rossum | 2007-12-18 21:10:42 +0100 (Tue, 18 Dec 2007) | 2 lines Issue #1645 by Alberto Bertogli. Fix a comment. ........ r59553 | raymond.hettinger | 2007-12-18 22:24:09 +0100 (Tue, 18 Dec 2007) | 12 lines Give meaning to the oparg for BUILD_MAP: estimated size of the dictionary. Allows dictionaries to be pre-sized (upto 255 elements) saving time lost to re-sizes with their attendant mallocs and re-insertions. Has zero effect on small dictionaries (5 elements or fewer), a slight benefit for dicts upto 22 elements (because they had to resize once anyway), and more benefit for dicts upto 255 elements (saving multiple resizes during the build-up and reducing the number of collisions on the first insertions). Beyond 255 elements, there is no addional benefit. ........ r59554 | christian.heimes | 2007-12-18 22:56:09 +0100 (Tue, 18 Dec 2007) | 1 line Fixed #1649: IDLE error: dictionary changed size during iteration ........ r59557 | raymond.hettinger | 2007-12-18 23:21:27 +0100 (Tue, 18 Dec 2007) | 1 line Simplify and speedup _asdict() for named tuples. ........ r59558 | christian.heimes | 2007-12-19 00:22:54 +0100 (Wed, 19 Dec 2007) | 3 lines Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). The patch unifies float("inf") and repr(float("inf")) on all platforms. ........ r59559 | raymond.hettinger | 2007-12-19 00:51:15 +0100 (Wed, 19 Dec 2007) | 1 line Users demand iterable input for named tuples. The author capitulates. ........ r59560 | raymond.hettinger | 2007-12-19 01:21:06 +0100 (Wed, 19 Dec 2007) | 1 line Beef-up tests for dict literals ........ r59561 | raymond.hettinger | 2007-12-19 01:27:21 +0100 (Wed, 19 Dec 2007) | 1 line Zap a duplicate line ........
18 years ago
  1. import sys, os
  2. # Delay import _tkinter until we have set TCL_LIBRARY,
  3. # so that Tcl_FindExecutable has a chance to locate its
  4. # encoding directory.
  5. # Unfortunately, we cannot know the TCL_LIBRARY directory
  6. # if we don't know the tcl version, which we cannot find out
  7. # without import Tcl. Fortunately, Tcl will itself look in
  8. # <TCL_LIBRARY>\..\tcl<TCL_VERSION>, so anything close to
  9. # the real Tcl library will do.
  10. # Expand symbolic links on Vista
  11. try:
  12. import ctypes
  13. ctypes.windll.kernel32.GetFinalPathNameByHandleW
  14. except (ImportError, AttributeError):
  15. def convert_path(s):
  16. return s
  17. else:
  18. def convert_path(s):
  19. if isinstance(s, bytes):
  20. s = s.decode("mbcs")
  21. hdir = ctypes.windll.kernel32.\
  22. CreateFileW(s, 0x80, # FILE_READ_ATTRIBUTES
  23. 1, # FILE_SHARE_READ
  24. None, 3, # OPEN_EXISTING
  25. 0x02000000, # FILE_FLAG_BACKUP_SEMANTICS
  26. None)
  27. if hdir == -1:
  28. # Cannot open directory, give up
  29. return s
  30. buf = ctypes.create_unicode_buffer("", 32768)
  31. res = ctypes.windll.kernel32.\
  32. GetFinalPathNameByHandleW(hdir, buf, len(buf),
  33. 0) # VOLUME_NAME_DOS
  34. ctypes.windll.kernel32.CloseHandle(hdir)
  35. if res == 0:
  36. # Conversion failed (e.g. network location)
  37. return s
  38. s = buf[:res]
  39. # Ignore leading \\?\
  40. if s.startswith("\\\\?\\"):
  41. s = s[4:]
  42. if s.startswith("UNC"):
  43. s = "\\" + s[3:]
  44. return s
  45. prefix = os.path.join(sys.prefix,"tcl")
  46. if not os.path.exists(prefix):
  47. # devdir/../tcltk/lib
  48. prefix = os.path.join(sys.prefix, os.path.pardir, "tcltk", "lib")
  49. prefix = os.path.abspath(prefix)
  50. # if this does not exist, no further search is needed
  51. if os.path.exists(prefix):
  52. prefix = convert_path(prefix)
  53. if "TCL_LIBRARY" not in os.environ:
  54. for name in os.listdir(prefix):
  55. if name.startswith("tcl"):
  56. tcldir = os.path.join(prefix,name)
  57. if os.path.isdir(tcldir):
  58. os.environ["TCL_LIBRARY"] = tcldir
  59. # Compute TK_LIBRARY, knowing that it has the same version
  60. # as Tcl
  61. import _tkinter
  62. ver = str(_tkinter.TCL_VERSION)
  63. if "TK_LIBRARY" not in os.environ:
  64. v = os.path.join(prefix, 'tk'+ver)
  65. if os.path.exists(os.path.join(v, "tclIndex")):
  66. os.environ['TK_LIBRARY'] = v
  67. # We don't know the Tix version, so we must search the entire
  68. # directory
  69. if "TIX_LIBRARY" not in os.environ:
  70. for name in os.listdir(prefix):
  71. if name.startswith("tix"):
  72. tixdir = os.path.join(prefix,name)
  73. if os.path.isdir(tixdir):
  74. os.environ["TIX_LIBRARY"] = tixdir