At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3797
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Mon 2008-10-27 08:54:19 +0000
message:
(mbp) Update osutils imports
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 3794.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: win32
timestamp: Mon 2008-10-27 18:29:32 +1100
message:
Update osutils imports to fix setup.py on Windows
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/win32utils.py
win32console.py-20051021033308-123c6c929d04973d
=== modified file 'bzrlib/plugin.py'
--- a/bzrlib/plugin.py 2008-10-07 06:41:46 +0000
+++ b/bzrlib/plugin.py 2008-10-27 07:29:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007 Canonical Ltd
+# Copyright (C) 2004, 2005, 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -33,7 +33,10 @@
import os
import sys
+from bzrlib import osutils
+
from bzrlib.lazy_import import lazy_import
+
lazy_import(globals(), """
import imp
import re
@@ -44,7 +47,6 @@
config,
debug,
errors,
- osutils,
trace,
)
from bzrlib import plugins as _mod_plugins
=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py 2008-10-21 15:36:44 +0000
+++ b/bzrlib/win32utils.py 2008-10-27 07:29:32 +0000
@@ -319,6 +319,7 @@
def _ensure_unicode(s):
+ from bzrlib import osutils
if s and type(s) != unicode:
from bzrlib import osutils
s = s.decode(osutils.get_user_encoding())
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
