[Python-checkins] r78760 - in python/trunk: Doc/library/argparse.rst Doc/reference/executionmodel.rst Doc/whatsnew/2.6.rst Misc/BeOS-setup.py Misc/HISTORY Misc/NEWS Misc/SpecialBuilds.txt

[A.M. Kuchling]

I'm confused by this set of changes.  Georg, what are the rules for
'built-in' vs 'builtin' you're following?

On Sun, Mar 07, 2010 at 04:24:00PM +0100, georg.brandl wrote:
> --- python/trunk/Doc/library/argparse.rst	(original)
> +++ python/trunk/Doc/library/argparse.rst	Sun Mar  7 16:23:59 2010
> -type-checking and type-conversions to be performed.  Many common builtin types
> +type-checking and type-conversions to be performed.  Many common built-in types

So, the style is 'built-in' as the adjective...

> --- python/trunk/Doc/whatsnew/2.6.rst	(original)
> +++ python/trunk/Doc/whatsnew/2.6.rst	Sun Mar  7 16:23:59 2010
> -semantics of some existing built-ins.  Functions that are new in 3.0
> +semantics of some existing builtins.  Functions that are new in 3.0

... but 'builtin' as the noun form ...

> Modified: python/trunk/Misc/HISTORY
> -- Bug #959576: The pwd module is now builtin. This allows Python to be
> +- Bug #959576: The pwd module is now built in. This allows Python to be

... except here, where it's 'built in' instead of 'built-in'.

Personally I would just use 'built-in' everywhere. I find 'builtin'
slightly more difficult to read because it's slightly ambiguous on
first view.  A reader might initially wonder if it's 'buil-tin' or
'built-in'.

> --- python/trunk/Doc/reference/executionmodel.rst	(original)
> +++ python/trunk/Doc/reference/executionmodel.rst	Sun Mar  7 16:23:59 2010
> -The built-in namespace associated with the execution of a code block is actually
> +The builtins namespace associated with the execution of a code block is actually

In executionmodel.rst 'built-in' was changed to 'builtins', which
seems totally wrong.  At least this part of the commit needs
reviewing, or reverting.

--amk