From 5aee0b6df1117f9d2bb038f2f9e2cd661eae9e6b Mon Sep 17 00:00:00 2001 From: Geoff Greer Date: Wed, 14 Sep 2011 15:10:18 -0700 Subject: [PATCH] Try importing simplejson before json. --- libcloud/common/cloudstack.py | 4 ++-- libcloud/common/gogrid.py | 4 ++-- libcloud/compute/drivers/bluebox.py | 4 ++-- libcloud/compute/drivers/brightbox.py | 4 ++-- libcloud/compute/drivers/dreamhost.py | 4 ++-- libcloud/compute/drivers/ecp.py | 4 ++-- libcloud/compute/drivers/elasticstack.py | 4 ++-- libcloud/compute/drivers/linode.py | 4 ++-- libcloud/compute/drivers/rimuhosting.py | 4 ++-- libcloud/compute/drivers/vpsnet.py | 4 ++-- libcloud/loadbalancer/drivers/gogrid.py | 4 ++-- libcloud/loadbalancer/drivers/rackspace.py | 4 ++-- libcloud/pricing.py | 4 ++-- libcloud/storage/drivers/cloudfiles.py | 4 ++-- test/common/test_cloudstack.py | 4 ++-- test/compute/test_brightbox.py | 4 ++-- test/compute/test_cloudstack.py | 4 ++-- test/compute/test_dreamhost.py | 4 ++-- test/loadbalancer/test_cloudstack.py | 4 ++-- test/loadbalancer/test_rackspace.py | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/libcloud/common/cloudstack.py b/libcloud/common/cloudstack.py index 6db52e2..f3690dd 100644 --- a/libcloud/common/cloudstack.py +++ b/libcloud/common/cloudstack.py @@ -20,9 +20,9 @@ import time import urllib try: - import json -except: import simplejson as json +except: + import json from libcloud.common.base import ConnectionUserAndKey, Response from libcloud.common.types import MalformedResponseError diff --git a/libcloud/common/gogrid.py b/libcloud/common/gogrid.py index 3b77549..5cc6fc7 100644 --- a/libcloud/common/gogrid.py +++ b/libcloud/common/gogrid.py @@ -17,9 +17,9 @@ import hashlib import time try: - import json -except ImportError: import simplejson as json +except ImportError: + import json from libcloud.common.types import InvalidCredsError, LibcloudError from libcloud.common.types import MalformedResponseError diff --git a/libcloud/compute/drivers/bluebox.py b/libcloud/compute/drivers/bluebox.py index 3ff4f6e..f64d3a2 100644 --- a/libcloud/compute/drivers/bluebox.py +++ b/libcloud/compute/drivers/bluebox.py @@ -27,9 +27,9 @@ import urllib import base64 try: - import json -except: import simplejson as json +except ImportError: + import json from libcloud.common.base import Response, ConnectionUserAndKey from libcloud.compute.providers import Provider diff --git a/libcloud/compute/drivers/brightbox.py b/libcloud/compute/drivers/brightbox.py index 1312bb6..08c7545 100644 --- a/libcloud/compute/drivers/brightbox.py +++ b/libcloud/compute/drivers/brightbox.py @@ -24,9 +24,9 @@ from libcloud.compute.base import NodeDriver from libcloud.compute.base import Node, NodeImage, NodeSize, NodeLocation try: - import json -except ImportError: import simplejson as json +except ImportError: + import json API_VERSION = '1.0' diff --git a/libcloud/compute/drivers/dreamhost.py b/libcloud/compute/drivers/dreamhost.py index fb857b6..51b982c 100644 --- a/libcloud/compute/drivers/dreamhost.py +++ b/libcloud/compute/drivers/dreamhost.py @@ -17,9 +17,9 @@ DreamHost Driver """ try: - import json -except: import simplejson as json +except ImportError: + import json import copy diff --git a/libcloud/compute/drivers/ecp.py b/libcloud/compute/drivers/ecp.py index 3c11316..2305549 100644 --- a/libcloud/compute/drivers/ecp.py +++ b/libcloud/compute/drivers/ecp.py @@ -25,9 +25,9 @@ import os # JSON is included in the standard library starting with Python 2.6. For 2.5 # and 2.4, there's a simplejson egg at: http://pypi.python.org/pypi/simplejson try: - import json -except: import simplejson as json +except ImportError: + import json from libcloud.common.base import Response, ConnectionUserAndKey from libcloud.compute.base import NodeDriver, NodeSize, NodeLocation diff --git a/libcloud/compute/drivers/elasticstack.py b/libcloud/compute/drivers/elasticstack.py index 7f32105..07a6cd9 100644 --- a/libcloud/compute/drivers/elasticstack.py +++ b/libcloud/compute/drivers/elasticstack.py @@ -24,9 +24,9 @@ import base64 import httplib try: - import json -except: import simplejson as json +except ImportError: + import json from libcloud.common.base import ConnectionUserAndKey, Response from libcloud.common.types import InvalidCredsError, MalformedResponseError diff --git a/libcloud/compute/drivers/linode.py b/libcloud/compute/drivers/linode.py index 0a0f866..b380c5f 100644 --- a/libcloud/compute/drivers/linode.py +++ b/libcloud/compute/drivers/linode.py @@ -32,9 +32,9 @@ import os from copy import copy try: - import json -except: import simplejson as json +except ImportError: + import json from libcloud.common.base import ConnectionKey, Response from libcloud.common.types import InvalidCredsError, MalformedResponseError diff --git a/libcloud/compute/drivers/rimuhosting.py b/libcloud/compute/drivers/rimuhosting.py index d0df077..a2d5086 100644 --- a/libcloud/compute/drivers/rimuhosting.py +++ b/libcloud/compute/drivers/rimuhosting.py @@ -16,9 +16,9 @@ RimuHosting Driver """ try: - import json -except: import simplejson as json +except ImportError: + import json from libcloud.common.base import ConnectionKey, Response from libcloud.common.types import InvalidCredsError diff --git a/libcloud/compute/drivers/vpsnet.py b/libcloud/compute/drivers/vpsnet.py index 9666428..181a62a 100644 --- a/libcloud/compute/drivers/vpsnet.py +++ b/libcloud/compute/drivers/vpsnet.py @@ -18,9 +18,9 @@ VPS.net driver import base64 try: - import json -except: import simplejson as json +except ImportError: + import json from libcloud.common.base import ConnectionUserAndKey, Response from libcloud.common.types import InvalidCredsError diff --git a/libcloud/loadbalancer/drivers/gogrid.py b/libcloud/loadbalancer/drivers/gogrid.py index 201e3f0..1882e9f 100644 --- a/libcloud/loadbalancer/drivers/gogrid.py +++ b/libcloud/loadbalancer/drivers/gogrid.py @@ -17,9 +17,9 @@ import time import httplib try: - import json -except ImportError: import simplejson as json +except ImportError: + import json from libcloud.common.types import LibcloudError from libcloud.utils import reverse_dict diff --git a/libcloud/loadbalancer/drivers/rackspace.py b/libcloud/loadbalancer/drivers/rackspace.py index cbb5cf2..47384e9 100644 --- a/libcloud/loadbalancer/drivers/rackspace.py +++ b/libcloud/loadbalancer/drivers/rackspace.py @@ -16,9 +16,9 @@ import os try: - import json -except ImportError: import simplejson as json +except ImportError: + import json from libcloud.utils import reverse_dict from libcloud.common.base import Response diff --git a/libcloud/pricing.py b/libcloud/pricing.py index 5db4af1..a47157d 100644 --- a/libcloud/pricing.py +++ b/libcloud/pricing.py @@ -18,9 +18,9 @@ A class which handles loading the pricing files. """ try: - import json -except: import simplejson as json +except ImportError: + import json import os.path from os.path import join as pjoin diff --git a/libcloud/storage/drivers/cloudfiles.py b/libcloud/storage/drivers/cloudfiles.py index 10ba5a7..aef4987 100644 --- a/libcloud/storage/drivers/cloudfiles.py +++ b/libcloud/storage/drivers/cloudfiles.py @@ -17,9 +17,9 @@ import httplib import urllib try: - import json -except: import simplejson as json +except ImportError: + import json from libcloud.utils import read_in_chunks from libcloud.common.types import MalformedResponseError, LibcloudError diff --git a/test/common/test_cloudstack.py b/test/common/test_cloudstack.py index 3176a16..74e8359 100644 --- a/test/common/test_cloudstack.py +++ b/test/common/test_cloudstack.py @@ -4,9 +4,9 @@ import unittest import urlparse try: - import json -except: import simplejson as json +except ImportError: + import json try: parse_qsl = urlparse.parse_qsl diff --git a/test/compute/test_brightbox.py b/test/compute/test_brightbox.py index 0842e0a..12b7fe3 100644 --- a/test/compute/test_brightbox.py +++ b/test/compute/test_brightbox.py @@ -17,9 +17,9 @@ import unittest import httplib try: - import json -except ImportError: import simplejson as json +except ImportError: + import json from libcloud.common.types import InvalidCredsError from libcloud.compute.drivers.brightbox import BrightboxNodeDriver diff --git a/test/compute/test_cloudstack.py b/test/compute/test_cloudstack.py index 15f3083..77f454a 100644 --- a/test/compute/test_cloudstack.py +++ b/test/compute/test_cloudstack.py @@ -4,9 +4,9 @@ import unittest import urlparse try: - import json -except: import simplejson as json +except ImportError: + import json try: parse_qsl = urlparse.parse_qsl diff --git a/test/compute/test_dreamhost.py b/test/compute/test_dreamhost.py index 6e16166..7da2723 100644 --- a/test/compute/test_dreamhost.py +++ b/test/compute/test_dreamhost.py @@ -17,9 +17,9 @@ import unittest import httplib try: - import json -except: import simplejson as json +except ImportError: + import json from libcloud.common.types import InvalidCredsError from libcloud.compute.drivers.dreamhost import DreamhostNodeDriver diff --git a/test/loadbalancer/test_cloudstack.py b/test/loadbalancer/test_cloudstack.py index a94dd94..399cd65 100644 --- a/test/loadbalancer/test_cloudstack.py +++ b/test/loadbalancer/test_cloudstack.py @@ -4,9 +4,9 @@ import unittest import urlparse try: - import json -except: import simplejson as json +except ImportError: + import json try: parse_qsl = urlparse.parse_qsl diff --git a/test/loadbalancer/test_rackspace.py b/test/loadbalancer/test_rackspace.py index 88ebf29..0702c9f 100644 --- a/test/loadbalancer/test_rackspace.py +++ b/test/loadbalancer/test_rackspace.py @@ -18,9 +18,9 @@ import sys import unittest try: - import json -except ImportError: import simplejson as json +except ImportError: + import json from libcloud.loadbalancer.base import Member, Algorithm from libcloud.loadbalancer.drivers.rackspace import RackspaceLBDriver -- 1.7.6.1