mirror of
https://github.com/borgbackup/borg.git
synced 2025-02-22 22:22:27 +00:00
remove borg.support, fixes #358
we only needed it because argparse was broken on some 3.2.x and 3.3.x pythons.
This commit is contained in:
parent
a2843bc939
commit
8a819d4499
5 changed files with 3 additions and 2405 deletions
|
@ -1,10 +1,8 @@
|
||||||
from .support import argparse # see support/__init__.py docstring
|
|
||||||
# DEPRECATED - remove after requiring py 3.4
|
|
||||||
|
|
||||||
from binascii import hexlify
|
from binascii import hexlify
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from hashlib import sha256
|
from hashlib import sha256
|
||||||
from operator import attrgetter
|
from operator import attrgetter
|
||||||
|
import argparse
|
||||||
import functools
|
import functools
|
||||||
import inspect
|
import inspect
|
||||||
import io
|
import io
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
from .support import argparse # see support/__init__.py docstring, DEPRECATED - remove after requiring py 3.4
|
import argparse
|
||||||
|
|
||||||
import binascii
|
import binascii
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
"""
|
|
||||||
3rd party stuff that needed fixing
|
|
||||||
|
|
||||||
Note: linux package maintainers feel free to remove any of these hacks
|
|
||||||
IF your python version is not affected.
|
|
||||||
|
|
||||||
argparse is broken with default args (double conversion):
|
|
||||||
affects: 3.2.0 <= python < 3.2.4
|
|
||||||
affects: 3.3.0 <= python < 3.3.1
|
|
||||||
|
|
||||||
as we still support 3.2 and 3.3 there is no other way than to bundle
|
|
||||||
a fixed version (I just took argparse.py from 3.2.6) and import it from
|
|
||||||
here (see import in archiver.py).
|
|
||||||
DEPRECATED - remove support.argparse after requiring python 3.4.
|
|
||||||
"""
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
2
setup.py
2
setup.py
|
@ -247,7 +247,7 @@ def run(self):
|
||||||
'Topic :: Security :: Cryptography',
|
'Topic :: Security :: Cryptography',
|
||||||
'Topic :: System :: Archiving :: Backup',
|
'Topic :: System :: Archiving :: Backup',
|
||||||
],
|
],
|
||||||
packages=['borg', 'borg.testsuite', 'borg.support', ],
|
packages=['borg', 'borg.testsuite', ],
|
||||||
entry_points={
|
entry_points={
|
||||||
'console_scripts': [
|
'console_scripts': [
|
||||||
'borg = borg.archiver:main',
|
'borg = borg.archiver:main',
|
||||||
|
|
Loading…
Reference in a new issue