x/swauth
Code Issues Proposed changes

use standard library json instead of simplejson

Browse Source 
Based on https://review.openstack.org/#/c/240596/

Change-Id: I7f5be799ea7dcb49b7d9df830f1f15ee9a02b3ca
This commit is contained in:
Peter Lisák 2015-11-23 12:13:07 +01:00
parent 0b1cc3769e
commit f5f3d7e72b
5 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/swauth-cleanup-tokens
View File

@ -16,12 +16,9 @@
from datetime import datetime from datetime import datetime
from datetime import timedelta from datetime import timedelta
try:
import simplejson as json
except ImportError:
import json
from getpass import getpass from getpass import getpass
import gettext import gettext
import json
from optparse import OptionParser from optparse import OptionParser
import re import re
from sys import argv from sys import argv

5
bin/swauth-list
View File

@ -14,12 +14,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
try:
import simplejson as json
except ImportError:
import json
from getpass import getpass from getpass import getpass
import gettext import gettext
import json
from optparse import OptionParser from optparse import OptionParser
from sys import argv from sys import argv
from sys import exit from sys import exit

5
bin/swauth-set-account-service
View File

@ -14,12 +14,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
try:
import simplejson as json
except ImportError:
import json
from getpass import getpass from getpass import getpass
import gettext import gettext
import json
from optparse import OptionParser from optparse import OptionParser
from sys import argv from sys import argv
from sys import exit from sys import exit

5
swauth/middleware.py
View File

@ -18,10 +18,7 @@ from hashlib import sha1
import hmac import hmac
from httplib import HTTPConnection from httplib import HTTPConnection
from httplib import HTTPSConnection from httplib import HTTPSConnection
try: import json
import simplejson as json
except ImportError:
import json
from time import gmtime from time import gmtime
from time import strftime from time import strftime
from time import time from time import time

5
test/unit/test_middleware.py
View File

@ -14,10 +14,7 @@
# limitations under the License. # limitations under the License.
from contextlib import contextmanager from contextlib import contextmanager
try: import json
import simplejson as json
except ImportError:
import json
from time import time from time import time
import unittest import unittest