diff --git a/IPython/lib/irunner.py b/IPython/lib/irunner.py
index 004c388..c7954dd 100755
--- a/IPython/lib/irunner.py
+++ b/IPython/lib/irunner.py
@@ -189,7 +189,7 @@ class InteractiveRunner(object):
 
         # if the source is a string, chop it up in lines so we can iterate
         # over it just as if it were an open file.
-        if not isinstance(source,file):
+        if isinstance(source, basestring):
             source = source.splitlines(True)
 
         if self.echo:
diff --git a/setup3.py b/setup3.py
index e5a6dca..43079dc 100644
--- a/setup3.py
+++ b/setup3.py
@@ -1,7 +1,11 @@
 import os.path
 from setuptools import setup
 
-from setupbase import (setup_args, find_scripts, find_packages, find_package_data)
+from setupbase import (setup_args,
+                       find_scripts,
+                       find_packages,
+                       find_package_data,
+                       )
     
 setup_args['entry_points'] = find_scripts(True, suffix='3')
 setup_args['packages'] = find_packages()