← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/trace.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/trace.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
59
59
import os
60
60
import sys
61
61
import time
62
 
import tempfile
63
62
 
64
63
from bzrlib.lazy_import import lazy_import
65
64
lazy_import(globals(), """
66
65
from cStringIO import StringIO
67
66
import errno
68
67
import locale
 
68
import tempfile
69
69
import traceback
70
70
""")
71
71
 
81
81
    debug,
82
82
    errors,
83
83
    osutils,
84
 
    plugin,
85
 
    symbol_versioning,
86
84
    ui,
87
85
    )
88
86
""")