boto/sqs/jsonmessage.py - Issue 8386013: Merging in latest boto.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: boto/sqs/jsonmessage.py

Issue 8386013: Merging in latest boto. (Closed) Base URL: svn://svn.chromium.org/boto

Patch Set: Redoing vendor drop by deleting and then merging. Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: boto/sqs/jsonmessage.py

diff --git a/boto/sqs/jsonmessage.py b/boto/sqs/jsonmessage.py

index 24a3be2d18f18a584d7a7b96a308d5aec297640c..fb0a4c30e419a161b543d90e6b99b15af02a0d62 100644

--- a/boto/sqs/jsonmessage.py

+++ b/boto/sqs/jsonmessage.py

@@ -23,9 +23,9 @@ from boto.sqs.message import MHMessage

from boto.exception import SQSDecodeError

import base64

try:

- import json

-except ImportError:

import simplejson as json

+except ImportError:

+ import json

class JSONMessage(MHMessage):

"""

« no previous file with comments | « boto/sqs/connection.py ('k') | boto/sqs/queue.py » ('j') | no next file with comments »