Merge pull request #2484 from enkore/f/json-keynamemismatch

--json: fix encryption[mode] not being the cmdline name

setup.py

@@ -578,7 +578,6 @@ ext_modules = []
 if not on_rtd:
     ext_modules += [
     Extension('borg.compress', [compress_source], libraries=['lz4'], include_dirs=include_dirs, library_dirs=library_dirs, define_macros=define_macros),
-    Extension('borg.crypto', [crypto_ll_source], libraries=crypto_libraries, include_dirs=include_dirs, library_dirs=library_dirs, define_macros=define_macros),
     Extension('borg.crypto.low_level', [crypto_ll_source], libraries=crypto_libraries, include_dirs=include_dirs, library_dirs=library_dirs, define_macros=define_macros),
     Extension('borg.hashindex', [hashindex_source]),
     Extension('borg.item', [item_source]),

src/borg/helpers.py

@@ -1942,7 +1942,7 @@ def basic_json_data(manifest, *, cache=None, extra=None):
     data.update({
         'repository': BorgJsonEncoder().default(manifest.repository),
         'encryption': {
-            'mode': key.NAME,
+            'mode': key.ARG_NAME,
         },
     })
     data['repository']['last_modified'] = format_time(to_localtime(manifest.last_timestamp.replace(tzinfo=timezone.utc)))