Return-Path: X-Original-To: apmail-libcloud-notifications-archive@www.apache.org Delivered-To: apmail-libcloud-notifications-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BA12317765 for ; Fri, 25 Sep 2015 16:56:41 +0000 (UTC) Received: (qmail 91533 invoked by uid 500); 25 Sep 2015 16:56:41 -0000 Delivered-To: apmail-libcloud-notifications-archive@libcloud.apache.org Received: (qmail 91508 invoked by uid 500); 25 Sep 2015 16:56:41 -0000 Mailing-List: contact notifications-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list notifications@libcloud.apache.org Received: (qmail 91463 invoked by uid 500); 25 Sep 2015 16:56:41 -0000 Delivered-To: apmail-libcloud-commits@libcloud.apache.org Received: (qmail 91435 invoked by uid 99); 25 Sep 2015 16:56:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Sep 2015 16:56:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6F915E0281; Fri, 25 Sep 2015 16:56:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tomaz@apache.org To: commits@libcloud.apache.org Date: Fri, 25 Sep 2015 16:56:44 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/5] libcloud git commit: Use simplejson if available. 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 Authored: Fri Sep 25 18:44:45 2015 +0200 Committer: Tomaz Muraus 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