Revert "Run directories containing __main__.py (fixes bpython#530)"

sebastinas · sebastinas · commit c83d08dc9c66 · 2015-04-30T16:33:35.000+02:00
This reverts commit c765887.
diff --git a/bpython/args.py b/bpython/args.py
@@ -4,7 +4,6 @@
 
 from __future__ import print_function
 import os
-import os.path
 import sys
 import code
 from optparse import OptionParser, OptionGroup
@@ -111,15 +110,10 @@ def exec_code(interpreter, args):
     Helper to execute code in a given interpreter. args should be a [faked]
     sys.argv
     """
-    plusmain = os.path.join(args[0], '__main__.py')
-    if os.path.isdir(args[0]) and os.path.exists(plusmain):
-        path = plusmain
-    else:
-        path = args[0]
-    with open(path, 'r') as sourcefile:
+    with open(args[0], 'r') as sourcefile:
         source = sourcefile.read()
     old_argv, sys.argv = sys.argv, args
-    sys.path.insert(0, os.path.abspath(os.path.dirname(path)))
-    interpreter.locals['__file__'] = path
-    interpreter.runsource(source, path, 'exec')
+    sys.path.insert(0, os.path.abspath(os.path.dirname(args[0])))
+    interpreter.locals['__file__'] = args[0]
+    interpreter.runsource(source, args[0], 'exec')
     sys.argv = old_argv
