From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 28 Dec 2004 21:53:49 +0000 (+0000)
Subject: Backport of 1.36:
X-Git-Tag: v2.4.1c1~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61ad60de36ef84bed5c3a341ffe7583435448c87;p=thirdparty%2FPython%2Fcpython.git

Backport of 1.36:
- getDefaultDatabase wasn't listed in __all__.
- using a different database for non-final releases should only be done
  for X.Y.0. Non-final micro releases can use the default database just fine,
  as they are required to be backward compatible.
---

diff --git a/Lib/plat-mac/pimp.py b/Lib/plat-mac/pimp.py
index 67fab7607dc5..5bea42fa72a6 100644
--- a/Lib/plat-mac/pimp.py
+++ b/Lib/plat-mac/pimp.py
@@ -28,7 +28,7 @@ import shutil
 import time
 
 __all__ = ["PimpPreferences", "PimpDatabase", "PimpPackage", "main",
-    "PIMP_VERSION", "main"]
+    "getDefaultDatabase", "PIMP_VERSION", "main"]
 
 _scriptExc_NotInstalled = "pimp._scriptExc_NotInstalled"
 _scriptExc_OldInstalled = "pimp._scriptExc_OldInstalled"
@@ -55,7 +55,7 @@ def getDefaultDatabase(experimental=False):
 
     major, minor, micro, state, extra = sys.version_info
     pyvers = '%d.%d' % (major, minor)
-    if state != 'final':
+    if micro == 0 and state != 'final':
         pyvers = pyvers + '%s%d' % (state, extra)
 
     longplatform = distutils.util.get_platform()