Преглед на файлове

try to fix RTD build *again*

Antoine Beaupré преди 9 години
родител
ревизия
e8ae96b54e
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 2 1
      borg/archive.py
  2. 1 1
      borg/key.py

+ 2 - 1
borg/archive.py

@@ -4,7 +4,7 @@ from itertools import groupby
 import errno
 from .key import key_factory
 from .remote import cache_if_remote
-import msgpack
+
 import os
 import socket
 import stat
@@ -18,6 +18,7 @@ if have_cython():
     from .platform import acl_get, acl_set
     from .chunker import Chunker
     from .hashindex import ChunkIndex
+    import msgpack
 
 ITEMS_BUFFER = 1024 * 1024
 

+ 1 - 1
borg/key.py

@@ -2,7 +2,6 @@ from binascii import hexlify, a2b_base64, b2a_base64
 import configparser
 import getpass
 import os
-import msgpack
 import textwrap
 import hmac
 from hashlib import sha256
@@ -11,6 +10,7 @@ from .helpers import IntegrityError, get_keys_dir, Error, have_cython
 if have_cython():
     from .crypto import pbkdf2_sha256, get_random_bytes, AES, bytes_to_long, long_to_bytes, bytes_to_int, num_aes_blocks
     from .compress import Compressor, COMPR_BUFFER
+    import msgpack
 
 PREFIX = b'\0' * 8