~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
79
79
IGNORE_FILENAME = ".bzrignore"
80
80
 
81
81
import os
82
 
import locale
 
82
import sys
 
83
if sys.platform == 'darwin':
 
84
    # work around egregious python 2.4 bug
 
85
    sys.platform = 'posix'
 
86
    import locale
 
87
    sys.platform = 'darwin'
 
88
else:
 
89
    import locale
83
90
user_encoding = locale.getpreferredencoding() or 'ascii'
84
91
del locale
85
92