Skip to content
Browse files

Merge branch 'master' of https://github.com/seantalts/boto into seant…

…alts-master
  • Loading branch information...
2 parents 74ed4ef + 0ee7b03 commit ddd1428b6ebe3b831cc0be48ba220d6c365e38b5 @garnaat garnaat committed Jul 8, 2011
Showing with 10 additions and 12 deletions.
  1. +2 −2 boto/ec2/cloudwatch/__init__.py
  2. +2 −4 boto/ec2/cloudwatch/alarm.py
  3. +2 −2 boto/pyami/config.py
  4. +2 −2 boto/sns/connection.py
  5. +2 −2 boto/sqs/jsonmessage.py
View
4 boto/ec2/cloudwatch/__init__.py
@@ -137,9 +137,9 @@
My server obviously isn't very busy right now!
"""
try:
- import json
-except ImportError:
import simplejson as json
+except ImportError:
+ import json
from boto.connection import AWSQueryConnection
from boto.ec2.cloudwatch.metric import Metric
View
6 boto/ec2/cloudwatch/alarm.py
@@ -23,12 +23,10 @@
from datetime import datetime
from boto.resultset import ResultSet
from boto.ec2.cloudwatch.listelement import ListElement
-
try:
- import json
-except ImportError:
import simplejson as json
-
+except ImportError:
+ import json
class MetricAlarm(object):
View
4 boto/pyami/config.py
@@ -197,9 +197,9 @@ def dump_safe(self, fp=None):
def dump_to_sdb(self, domain_name, item_name):
try:
- import json
- except ImportError:
import simplejson as json
+ except ImportError:
+ import json
sdb = boto.connect_sdb()
domain = sdb.lookup(domain_name)
View
4 boto/sns/connection.py
@@ -24,9 +24,9 @@
import boto
import uuid
try:
- import json
-except ImportError:
import simplejson as json
+except ImportError:
+ import json
#boto.set_stream_logger('sns')
View
4 boto/sqs/jsonmessage.py
@@ -23,9 +23,9 @@
from boto.exception import SQSDecodeError
import base64
try:
- import json
-except ImportError:
import simplejson as json
+except ImportError:
+ import json
class JSONMessage(MHMessage):
"""

0 comments on commit ddd1428

Please sign in to comment.
Something went wrong with that request. Please try again.