← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/request.py

  • Committer: Vincent Ladeuil
  • Date: 2012-08-01 09:27:40 UTC
  • mfrom: (6437.63.4 2.5)
  • mto: This revision was merged to the branch mainline in revision 6549.
  • Revision ID: v.ladeuil+lp@free.fr-20120801092740-rhcwpdylg14ojvrq
Merge 2.5 including fix for bug #957049

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
36
36
import threading
37
37
 
38
38
from bzrlib import (
39
 
    bzrdir,
40
39
    debug,
41
40
    errors,
42
41
    osutils,
47
46
    )
48
47
from bzrlib.lazy_import import lazy_import
49
48
lazy_import(globals(), """
 
49
from bzrlib import bzrdir
50
50
from bzrlib.bundle import serializer
51
51
 
52
52
import tempfile