diff options
| -rw-r--r-- | Lib/idlelib/configDialog.py | 1 | ||||
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 2 | ||||
| -rw-r--r-- | Mac/Makefile.in | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py index 20ed827..2ce87d7 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -1104,6 +1104,7 @@ class ConfigDialog(Toplevel): def DeactivateCurrentConfig(self): #Before a config is saved, some cleanup of current #config must be done - remove the previous keybindings + print self.parent, type(self.parent) winInstances = self.parent.instance_dict.keys() for instance in winInstances: instance.RemoveKeybindings() diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 3cd9d2d..d6a8618 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -225,7 +225,7 @@ PKG_RECIPES = [ is not necessary to use Python. """, required=False, - selected='unselected', + selected='selected', ), dict( name="PythonDocumentation", diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 4d55e4b..7d88c4a 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -91,7 +91,8 @@ installunixtools: fi for fn in python3 pythonw3 idle3 pydoc3 python3-config \ python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ - pydoc$(VERSION) python$(VERSION)-config ;\ + pydoc$(VERSION) python$(VERSION)-config 2to3 \ + 2to3-$(VERSION) ;\ do \ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done @@ -109,7 +110,7 @@ altinstallunixtools: $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\ fi for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \ - pydoc$(VERSION) python$(VERSION)-config ;\ + pydoc$(VERSION) python$(VERSION)-config 2to3-$(VERSION);\ do \ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done @@ -130,6 +131,8 @@ install_versionedtools: mv "$(DESTDIR)$(prefix)/bin/$${fn}3" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\ ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}3" ;\ done + mv "$(DESTDIR)$(prefix)/bin/2to3" "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)" + ln -sf "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3" if [ ! -h "$(DESTDIR)$(prefix)/bin/python3-config" ]; then \ mv "$(DESTDIR)$(prefix)/bin/python3-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\ ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python3-config" ; \ |