[Jython-checkins] jython (merge 2.5 -> default): Merge from 2.5.

[Alan Kennedy]

Hi Frank,

[frank.wierzbicki]

> diff --git a/Lib/os.py b/Lib/os.py
> --- a/Lib/os.py
> +++ b/Lib/os.py
> @@ -114,6 +114,20 @@
>     __all__.extend(_get_exports_list(riscos))
>     del riscos
>
> +elif 'ibmi' in _names:
> +    _name = 'ibmi'
> +    linesep = '\n'
> +    from ibmi import *
> +    try:
> +        from ibmi import _exit
> +    except ImportError:
> +        pass
> +    import posixpath as path
> +
> +    import ibmi
> +    __all__.extend(_get_exports_list(ibmi))
> +    del ibmi
> +
>  else:
>     raise ImportError, 'no os specific module found'

I was holding off on merging this up from 2.5: I'd prefer to get
feedback from the IBM people before propagating it.

I don't have any capability to run the code to verify its right-or-wrong'ness.

Alan.