/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-03 22:13:09 UTC
  • mfrom: (6421 +trunk)
  • mto: (6437.3.23 2.5)
  • mto: This revision was merged to the branch mainline in revision 6451.
  • Revision ID: jelmer@samba.org-20120103221309-i37nc7q09erm17xx
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
2076
2076
            # On windows want the result of GetACP() which this boils down to.
2077
2077
            _message_encoding = get_user_encoding()
2078
2078
    return _message_encoding or "ascii"
2079
 
        
 
2079
 
2080
2080
 
2081
2081
def get_host_name():
2082
2082
    """Return the current unicode host name.
2085
2085
    behaves inconsistently on different platforms.
2086
2086
    """
2087
2087
    if sys.platform == "win32":
2088
 
        import win32utils
2089
2088
        return win32utils.get_host_name()
2090
2089
    else:
2091
2090
        import socket