← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-09 12:45:17 UTC
  • mto: This revision was merged to the branch mainline in revision 6060.
  • Revision ID: v.ladeuil+lp@free.fr-20110809124517-zpb3aqf3808km514
Use _fs_enc instead of utf8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
1515
1515
        return osutils.pathjoin(base, 'bazaar', '2.0')
1516
1516
    else:
1517
1517
        if base is not None:
1518
 
            # paths in environment variables may not be ascii, we decode them
1519
 
            # as utf8 to be safe
1520
 
            base = base.decode('utf-8')
 
1518
            base = base.decode(osutils._fs_enc)
1521
1519
    if sys.platform == 'darwin':
1522
1520
        if base is None:
1523
1521
            # this takes into account $HOME
2574
2572
class GlobalStore(LockableIniFileStore):
2575
2573
 
2576
2574
    def __init__(self, possible_transports=None):
2577
 
        t = transport.get_transport_from_path(config_dir(),
2578
 
                                    possible_transports=possible_transports)
 
2575
        t = transport.get_transport_from_path(
 
2576
            config_dir(), possible_transports=possible_transports)
2579
2577
        super(GlobalStore, self).__init__(t, 'bazaar.conf')
2580
2578
 
2581
2579
 
2582
2580
class LocationStore(LockableIniFileStore):
2583
2581
 
2584
2582
    def __init__(self, possible_transports=None):
2585
 
        t = transport.get_transport_from_path(config_dir(),
2586
 
                                    possible_transports=possible_transports)
 
2583
        t = transport.get_transport_from_path(
 
2584
            config_dir(), possible_transports=possible_transports)
2587
2585
        super(LocationStore, self).__init__(t, 'locations.conf')
2588
2586
 
2589
2587