You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2011/09/15 12:51:19 UTC
svn commit: r1171050 - in /libcloud/trunk: libcloud/ libcloud/common/
libcloud/compute/drivers/ libcloud/loadbalancer/drivers/
libcloud/storage/drivers/ test/common/ test/compute/ test/loadbalancer/
Author: tomaz
Date: Thu Sep 15 10:51:18 2011
New Revision: 1171050
URL: http://svn.apache.org/viewvc?rev=1171050&view=rev
Log:
Prefer simplejson (if available) over json module. The patch has been
contributed by Geoff Greer <geoff at greer dot fm> and is part of LIBCLOUD-112.
Modified:
libcloud/trunk/libcloud/common/cloudstack.py
libcloud/trunk/libcloud/common/gogrid.py
libcloud/trunk/libcloud/compute/drivers/bluebox.py
libcloud/trunk/libcloud/compute/drivers/brightbox.py
libcloud/trunk/libcloud/compute/drivers/dreamhost.py
libcloud/trunk/libcloud/compute/drivers/ecp.py
libcloud/trunk/libcloud/compute/drivers/elasticstack.py
libcloud/trunk/libcloud/compute/drivers/linode.py
libcloud/trunk/libcloud/compute/drivers/rimuhosting.py
libcloud/trunk/libcloud/compute/drivers/vpsnet.py
libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py
libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py
libcloud/trunk/libcloud/pricing.py
libcloud/trunk/libcloud/storage/drivers/cloudfiles.py
libcloud/trunk/test/common/test_cloudstack.py
libcloud/trunk/test/compute/test_brightbox.py
libcloud/trunk/test/compute/test_cloudstack.py
libcloud/trunk/test/compute/test_dreamhost.py
libcloud/trunk/test/loadbalancer/test_cloudstack.py
libcloud/trunk/test/loadbalancer/test_rackspace.py
Modified: libcloud/trunk/libcloud/common/cloudstack.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/common/cloudstack.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/common/cloudstack.py (original)
+++ libcloud/trunk/libcloud/common/cloudstack.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/common/gogrid.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/common/gogrid.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/common/gogrid.py (original)
+++ libcloud/trunk/libcloud/common/gogrid.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/compute/drivers/bluebox.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/bluebox.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/bluebox.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/bluebox.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/compute/drivers/brightbox.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/brightbox.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/brightbox.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/brightbox.py Thu Sep 15 10:51:18 2011
@@ -24,9 +24,9 @@ from libcloud.compute.base import NodeDr
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'
Modified: libcloud/trunk/libcloud/compute/drivers/dreamhost.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/dreamhost.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/dreamhost.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/dreamhost.py Thu Sep 15 10:51:18 2011
@@ -17,9 +17,9 @@ DreamHost Driver
"""
try:
- import json
-except:
import simplejson as json
+except ImportError:
+ import json
import copy
Modified: libcloud/trunk/libcloud/compute/drivers/ecp.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/ecp.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/ecp.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/ecp.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/compute/drivers/elasticstack.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/elasticstack.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/elasticstack.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/elasticstack.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/compute/drivers/linode.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/linode.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/linode.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/linode.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/compute/drivers/rimuhosting.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/rimuhosting.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/rimuhosting.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/rimuhosting.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/compute/drivers/vpsnet.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/vpsnet.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/vpsnet.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/vpsnet.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py (original)
+++ libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py (original)
+++ libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/libcloud/pricing.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/pricing.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/pricing.py (original)
+++ libcloud/trunk/libcloud/pricing.py Thu Sep 15 10:51:18 2011
@@ -18,9 +18,9 @@ A class which handles loading the pricin
"""
try:
- import json
-except:
import simplejson as json
+except ImportError:
+ import json
import os.path
from os.path import join as pjoin
Modified: libcloud/trunk/libcloud/storage/drivers/cloudfiles.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/storage/drivers/cloudfiles.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/libcloud/storage/drivers/cloudfiles.py (original)
+++ libcloud/trunk/libcloud/storage/drivers/cloudfiles.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/test/common/test_cloudstack.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/common/test_cloudstack.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/test/common/test_cloudstack.py (original)
+++ libcloud/trunk/test/common/test_cloudstack.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/test/compute/test_brightbox.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_brightbox.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_brightbox.py (original)
+++ libcloud/trunk/test/compute/test_brightbox.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/test/compute/test_cloudstack.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_cloudstack.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_cloudstack.py (original)
+++ libcloud/trunk/test/compute/test_cloudstack.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/test/compute/test_dreamhost.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_dreamhost.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_dreamhost.py (original)
+++ libcloud/trunk/test/compute/test_dreamhost.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/test/loadbalancer/test_cloudstack.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_cloudstack.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_cloudstack.py (original)
+++ libcloud/trunk/test/loadbalancer/test_cloudstack.py Thu Sep 15 10:51:18 2011
@@ -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
Modified: libcloud/trunk/test/loadbalancer/test_rackspace.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_rackspace.py?rev=1171050&r1=1171049&r2=1171050&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_rackspace.py (original)
+++ libcloud/trunk/test/loadbalancer/test_rackspace.py Thu Sep 15 10:51:18 2011
@@ -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