0.2.4 (bad upload of 0.2.3 to pypi).

Prettify vendor+json and vendor+xml Content-Type responses

README.rst

@@ -225,7 +225,7 @@ Before a pull requests is submitted, it's a good idea to run the existing suite
 Changelog
 ---------
 
-* `0.2.3 <https://github.com/jkbr/httpie/compare/0.2.2...0.2.3>`_ (2012-06-24)
+* `0.2.4 <https://github.com/jkbr/httpie/compare/0.2.2...0.2.4>`_ (2012-06-24)
     * Unicode characters in prettified JSON now don't get escaped to improve readability.
     * --auth now prompts for a password if only a username provided.
     * Added support for request payloads from a file path with automatic ``Content-Type`` (``http URL @/path``).

httpie/__init__.py

@@ -3,5 +3,5 @@ HTTPie - cURL for humans.
 
 """
 __author__ = 'Jakub Roztocil'
-__version__ = '0.2.3'
+__version__ = '0.2.4'
 __licence__ = 'BSD'

httpie/pretty.py

@@ -1,4 +1,5 @@
 import os
+import re
 import json
 
 import pygments
@@ -18,6 +19,8 @@ FORMATTER = (Terminal256Formatter
              if '256color' in os.environ.get('TERM', '')
              else TerminalFormatter)
 
+application_content_type_re = re.compile(r'application/(.+\+)?(json|xml)$')
+
 
 class PrettyHttp(object):
 
@@ -33,12 +36,18 @@ class PrettyHttp(object):
 
     def body(self, content, content_type):
         content_type = content_type.split(';')[0]
+        application_match = re.match(application_content_type_re, content_type)
+        if application_match:
+            # Strip vendor and extensions from Content-Type
+            vendor, extension = application_match.groups()
+            content_type = content_type.replace(vendor, u"")
+
         try:
             lexer = get_lexer_for_mimetype(content_type)
         except ClassNotFound:
             return content
 
-        if content_type == 'application/json':
+        if content_type == "application/json":
             try:
                 # Indent and sort the JSON data.
                 content = json.dumps(json.loads(content),