From 1c61f87da3a1128afcf4c03b157477de3948dfe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 8 Oct 2015 17:20:52 -0400 Subject: [PATCH] remove debugging code and fix all have_cython calls --- borg/cache.py | 2 +- borg/fuse.py | 2 +- setup.py | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/borg/cache.py b/borg/cache.py index 0f559f15e..4df4b7721 100644 --- a/borg/cache.py +++ b/borg/cache.py @@ -15,7 +15,7 @@ from .helpers import Error, get_cache_dir, decode_dict, st_mtime_ns, unhexlify, from .locking import UpgradableLock from .hashindex import ChunkIndex -if have_cython: +if have_cython(): import msgpack diff --git a/borg/fuse.py b/borg/fuse.py index d7a5aa5ce..6f98f0a01 100644 --- a/borg/fuse.py +++ b/borg/fuse.py @@ -10,7 +10,7 @@ from .archive import Archive from .helpers import daemonize, have_cython from .remote import cache_if_remote -if have_cython: +if have_cython(): import msgpack # Does this version of llfuse support ns precision? diff --git a/setup.py b/setup.py index 99fab07d8..f2a3f8bb9 100644 --- a/setup.py +++ b/setup.py @@ -140,9 +140,6 @@ class build_usage(Command): # allows us to build docs without the C modules fully loaded during help generation if 'BORG_CYTHON_DISABLE' not in os.environ: os.environ['BORG_CYTHON_DISABLE'] = self.__class__.__name__ - from borg.helpers import have_cython - print('have_cython? %s' % have_cython()) - print("CYTHON ENV: %s" % os.environ.get('BORG_CYTHON_DISABLE')) from borg.archiver import Archiver parser = Archiver().build_parser(prog='borg') choices = {}