/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/sixish.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/sixish.py
35
35
    viewitems,
36
36
    viewkeys,
37
37
    viewvalues,
38
 
)
 
38
    )  # noqa: F401
39
39
 
40
40
 
41
41
# The io module exists in Python 2.7 but lacks optimisation. Most uses are not
46
46
    StringIO = _io.StringIO
47
47
    from builtins import range, map, zip
48
48
else:
49
 
    from cStringIO import StringIO as BytesIO
50
 
    from StringIO import StringIO
51
 
    from future_builtins import zip, map
52
 
    range = xrange
 
49
    from cStringIO import StringIO as BytesIO  # noqa: F401
 
50
    from StringIO import StringIO  # noqa: F401
 
51
    from future_builtins import zip, map  # noqa: F401
 
52
    range = xrange  # noqa: F821
53
53
 
54
54
 
55
55
# GZ 2017-06-10: Work out if interning bits of inventory is behaviour we want