~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Patch Queue Manager
  • Date: 2012-01-03 12:30:05 UTC
  • mfrom: (6408.1.1 for-babune)
  • Revision ID: pqm@pqm.ubuntu.com-20120103123005-3guoyc4jastk4lwk
(gz) Remove needless and breakage causing relative import of win32utils in
 osutils.get_host_name (Bazaar Developers)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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