← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/request.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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