aboutsummaryrefslogtreecommitdiffstats
path: root/cards
diff options
context:
space:
mode:
authorhploetz <hploetz@f711b948-2313-0410-aaa9-d29f33439f0b>2007-06-08 00:14:22 +0000
committerhploetz <hploetz@f711b948-2313-0410-aaa9-d29f33439f0b>2007-06-08 00:14:22 +0000
commitd7aa71ca8d6f812f3bdb0ea4b319b942505aeb02 (patch)
tree4850fb6262543dc798d0964b8e9080bc57003661 /cards
parent94fbb4190c436225908142f60124a60ba8459626 (diff)
Centralize pycsc windows import hack
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@222 f711b948-2313-0410-aaa9-d29f33439f0b
Diffstat (limited to 'cards')
-rw-r--r--cards/generic_card.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/cards/generic_card.py b/cards/generic_card.py
index fc01281..b851bd2 100644
--- a/cards/generic_card.py
+++ b/cards/generic_card.py
@@ -1,13 +1,4 @@
-try:
- import pycsc
-except ImportError,e:
- try:
- import PyCSC
- from PyCSC import pycsc # Windows
- pycsc.SCARD_PROTOCOL_ANY = PyCSC.SCARD_PROTOCOL_ANY
- except ImportError:
- raise e # raise the original exception, masking the windows-only attempt
-
+from utils import pycsc
import TLV_utils, crypto_utils, utils, binascii, fnmatch, sre
from utils import C_APDU, R_APDU