diff options
author | Filipp Lepalaan <f@230.to> | 2013-06-03 19:53:40 +0300 |
---|---|---|
committer | Filipp Lepalaan <f@230.to> | 2013-06-03 19:53:40 +0300 |
commit | 2619ed1d7a7a1a83271a59a43d798115dd9f997c (patch) | |
tree | 657cce7f9096837eeee060baba9caeb0d088cb47 /gsxws/comptia.py | |
parent | 68fa03eff76f6ba40e0ba1de18a4bdec4c533a5f (diff) | |
parent | 3f6447a3af20e732f49f9e58e67752794535863a (diff) | |
download | py-gsxws-2619ed1d7a7a1a83271a59a43d798115dd9f997c.tar.gz py-gsxws-2619ed1d7a7a1a83271a59a43d798115dd9f997c.tar.bz2 py-gsxws-2619ed1d7a7a1a83271a59a43d798115dd9f997c.zip |
Merge branch 'master' of github.com:filipp/py-gsxws
Conflicts:
gsxws/core.py
Diffstat (limited to 'gsxws/comptia.py')
-rw-r--r-- | gsxws/comptia.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gsxws/comptia.py b/gsxws/comptia.py index 7851b17..532f2f4 100644 --- a/gsxws/comptia.py +++ b/gsxws/comptia.py @@ -1,8 +1,5 @@ -import os -import json import logging - -from core import GsxObject, GsxError, GsxCache +from core import GsxObject, GsxCache MODIFIERS = ( ("A", "Not Applicable"), @@ -42,8 +39,6 @@ class CompTIA(GsxObject): """ self._comptia = {} self._cache = GsxCache("comptia") - df = open(os.path.join(os.path.dirname(__file__), 'comptia.json')) - self._comptia = json.load(df) def fetch(self): """ |