From 786600ebb6a00f7a38859a95ea096a91ff0aee22 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 16 Apr 2011 10:30:57 +0900 Subject: [PATCH] check python version and locale on load --- anki/__init__.py | 8 ++++++++ anki/db.py | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/anki/__init__.py b/anki/__init__.py index 1baae1b2b..38658e636 100644 --- a/anki/__init__.py +++ b/anki/__init__.py @@ -37,5 +37,13 @@ Save & close: deck.close() """ +import sys +if sys.version_info[0] > 2: + raise Exception("Anki should be run with python2.x.") +elif sys.version_info[1] < 5: + raise Exception("Anki requires Python 2.5+") +if sys.getfilesystemencoding().lower() in ("ascii", "ansi_x3.4-1968"): + raise Exception("Anki requires a UTF-8 locale.") + version = "1.99" from anki.storage import Deck diff --git a/anki/db.py b/anki/db.py index 5d433703c..734037b55 100644 --- a/anki/db.py +++ b/anki/db.py @@ -6,10 +6,7 @@ import os try: from pysqlite2 import dbapi2 as sqlite except ImportError: - try: - from sqlite3 import dbapi2 as sqlite - except: - raise Exception("Please install pysqlite2 or python2.5") + from sqlite3 import dbapi2 as sqlite from anki.hooks import runHook