From 99adc658d59596e79be5bcf35e26004cbd16ae4f Mon Sep 17 00:00:00 2001 From: flan Date: Sat, 28 Oct 2017 20:43:09 +0200 Subject: [PATCH] Remove support for legacy modules --- README.md | 2 +- ankisyncd/sync_app.py | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8901b48..1700f86 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Installing 1. Install the dependencies: - $ pip install webob simplejson + $ pip install webob 2. Patch the bundled libanki: diff --git a/ankisyncd/sync_app.py b/ankisyncd/sync_app.py index 5d28f65..da978ef 100644 --- a/ankisyncd/sync_app.py +++ b/ankisyncd/sync_app.py @@ -22,11 +22,13 @@ from webob import Response import os import hashlib +import json import logging import random import string import unicodedata import zipfile +from sqlite3 import dbapi2 as sqlite import ankisyncd @@ -36,21 +38,11 @@ from anki.sync import Syncer, MediaSyncer from anki.utils import intTime, checksum, isMac from anki.consts import SYNC_ZIP_SIZE, SYNC_ZIP_COUNT -try: - import simplejson as json -except ImportError: - import json - try: from cStringIO import StringIO except ImportError: from StringIO import StringIO -try: - from pysqlite2 import dbapi2 as sqlite -except ImportError: - from sqlite3 import dbapi2 as sqlite - class SyncCollectionHandler(Syncer): operations = ['meta', 'applyChanges', 'start', 'chunk', 'applyChunk', 'sanityCheck2', 'finish']