Merge 136fbcf into 64f6f69

httpie/cli.py

@@ -164,6 +164,17 @@ def _split_lines(self, text, width):
 
     """
 )
+content_type.add_argument(
+    '--xssi', '-x',
+    dest='xssi_prefix',
+    metavar='PREFIX',
+    default='',
+    help="""
+    (default) Assumes incoming JSON has no XSSI Prefix
+    Allows Specifying a particular XSSI Prefix for the incoming JSON.
+
+    """
+)
 content_type.add_argument(
     '--form', '-f',
     action='store_true',

httpie/output/formatters/json.py

@@ -17,6 +17,10 @@ def format_body(self, body, mime):
         ]
         if (self.kwargs['explicit_json'] or
                 any(token in mime for token in maybe_json)):
+            if 'xssi_prefix' in self.kwargs:
+                token = self.kwargs["xssi_prefix"]
+                if body[0:len(token)] == token:
+                    body = body[len(token):]
             try:
                 obj = json.loads(body)
             except ValueError:

httpie/output/streams.py

@@ -117,6 +117,7 @@ def get_stream_type(env, args):
                 groups=args.prettify,
                 color_scheme=args.style,
                 explicit_json=args.json,
+                xssi_prefix=args.xssi_prefix
             ),
         )
     else: