← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

Merge bzr.dev (and fix NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
16
16
 
17
17
"""bzr library"""
18
18
 
 
19
from bzrlib.osutils import get_user_encoding
 
20
 
19
21
 
20
22
IGNORE_FILENAME = ".bzrignore"
21
23
 
22
 
import os
23
 
import sys
24
 
if sys.platform == 'darwin':
25
 
    # work around egregious python 2.4 bug
26
 
    sys.platform = 'posix'
27
 
    import locale
28
 
    sys.platform = 'darwin'
29
 
else:
30
 
    import locale
31
 
# XXX: This probably belongs in osutils instead
32
 
user_encoding = locale.getpreferredencoding() or 'ascii'
33
 
del locale
 
24
 
 
25
# XXX: Compatibility. This should probably be deprecated
 
26
user_encoding = get_user_encoding()
 
27
 
34
28
 
35
29
__copyright__ = "Copyright 2005, 2006 Canonical Development Ltd."
36
30