/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/archive/tar.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-03 23:21:15 UTC
  • mfrom: (7290.42.6 paramiko-compat)
  • Revision ID: breezy.the.bot@gmail.com-20200203232115-g7k11bhsfeiqcprv
Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Merged from https://code.launchpad.net/~jelmer/brz/paramiko-compat/+merge/378480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/archive/tar.py
19
19
from __future__ import absolute_import
20
20
 
21
21
from contextlib import closing
22
 
from io import BytesIO
23
22
import os
24
23
import sys
25
24
import tarfile
29
28
    osutils,
30
29
    )
31
30
from ..export import _export_iter_entries
 
31
from ..sixish import (
 
32
    BytesIO,
 
33
    )
32
34
 
33
35
 
34
36
def prepare_tarball_item(tree, root, final_path, tree_path, entry, force_mtime=None):
183
185
    except ImportError as e:
184
186
        raise errors.DependencyNotPresent('lzma', e)
185
187
 
186
 
    compressor = lzma.LZMACompressor(
187
 
        format={
188
 
            'xz': lzma.FORMAT_XZ,
189
 
            'raw': lzma.FORMAT_RAW,
190
 
            'alone': lzma.FORMAT_ALONE,
191
 
            }[compression_format])
 
188
    if sys.version_info[0] == 2:
 
189
        compressor = lzma.LZMACompressor(
 
190
            options={"format": compression_format})
 
191
    else:
 
192
        compressor = lzma.LZMACompressor(
 
193
            format={
 
194
                'xz': lzma.FORMAT_XZ,
 
195
                'raw': lzma.FORMAT_RAW,
 
196
                'alone': lzma.FORMAT_ALONE,
 
197
                }[compression_format])
192
198
 
193
199
    for chunk in tarball_generator(
194
200
            tree, root, subdir, force_mtime=force_mtime):