Rev 6414: (gz) Remove needless and breakage causing relative import of win32utils in in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6414 [merge]
revision-id: pqm at pqm.ubuntu.com-20120103123005-3guoyc4jastk4lwk
parent: pqm at pqm.ubuntu.com-20120103120403-05m286q87wkbygl6
parent: v.ladeuil+lp at free.fr-20120102082201-e3dhs3ggb11sj5eu
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2012-01-03 12:30:05 +0000
message:
  (gz) Remove needless and breakage causing relative import of win32utils in
   osutils.get_host_name (Bazaar Developers)
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2011-12-19 17:39:35 +0000
+++ b/bzrlib/osutils.py	2012-01-02 08:22:01 +0000
@@ -2076,7 +2076,7 @@
             # On windows want the result of GetACP() which this boils down to.
             _message_encoding = get_user_encoding()
     return _message_encoding or "ascii"
-        
+
 
 def get_host_name():
     """Return the current unicode host name.
@@ -2085,7 +2085,6 @@
     behaves inconsistently on different platforms.
     """
     if sys.platform == "win32":
-        import win32utils
         return win32utils.get_host_name()
     else:
         import socket