Fixing two minor things for review.

* Using basestring for str, unicode test.
* png->jpeg in display_jpeg.

IPython/core/display.py

@@ -155,7 +155,7 b' def display_jpeg(*objs, **kwargs):'
     raw = kwargs.pop('raw',False)
     if raw:
         for obj in objs:
-            publish_png(obj)
+            publish_jpeg(obj)
     else:
         display(*objs, include=['text/plain','image/jpeg'])
 

IPython/core/displaypub.py

@@ -56,7 +56,7 b' class DisplayPublisher(Configurable):'
             Any metadata for the data.
         """
 
-        if not isinstance(source, (str,unicode)):
+        if not isinstance(source, basestring):
             raise TypeError('source must be a str, got: %r' % source)
         if not isinstance(data, dict):
             raise TypeError('data must be a dict, got: %r' % data)