libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject [4/5] libcloud git commit: Use simplejson if available.
Date Fri, 25 Sep 2015 16:56:44 GMT
Use simplejson if available.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/72d1fec6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/72d1fec6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/72d1fec6

Branch: refs/heads/trunk
Commit: 72d1fec69a587ac23f27534fbbbc350021a6d179
Parents: c914109
Author: Tomaz Muraus <tomaz@apache.org>
Authored: Fri Sep 25 18:44:45 2015 +0200
Committer: Tomaz Muraus <tomaz@apache.org>
Committed: Fri Sep 25 18:44:45 2015 +0200

----------------------------------------------------------------------
 libcloud/dns/drivers/pointdns.py     | 5 ++++-
 libcloud/dns/drivers/worldwidedns.py | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/72d1fec6/libcloud/dns/drivers/pointdns.py
----------------------------------------------------------------------
diff --git a/libcloud/dns/drivers/pointdns.py b/libcloud/dns/drivers/pointdns.py
index 0fc3528..acd99ca 100644
--- a/libcloud/dns/drivers/pointdns.py
+++ b/libcloud/dns/drivers/pointdns.py
@@ -20,7 +20,10 @@ __all__ = [
     'PointDNSDriver'
 ]
 
-import json
+try:
+    import simplejson as json
+except ImportError:
+    import json
 
 from libcloud.common.types import MalformedResponseError
 from libcloud.common.pointdns import PointDNSConnection

http://git-wip-us.apache.org/repos/asf/libcloud/blob/72d1fec6/libcloud/dns/drivers/worldwidedns.py
----------------------------------------------------------------------
diff --git a/libcloud/dns/drivers/worldwidedns.py b/libcloud/dns/drivers/worldwidedns.py
index d5fdd5a..f387dc5 100644
--- a/libcloud/dns/drivers/worldwidedns.py
+++ b/libcloud/dns/drivers/worldwidedns.py
@@ -19,6 +19,7 @@ World Wide DNS Driver
 __all__ = [
     'WorldWideDNSDriver'
 ]
+
 import re
 
 from libcloud.common.types import LibcloudError


Mime
View raw message