1 --- runpy.py.old	2008-10-19 16:02:18.000000000 -0700

     2 +++ runpy.py	2008-10-19 16:13:44.000000000 -0700

     3 @@ -79,10 +79,13 @@

     4      loader = get_loader(mod_name)

     5      if loader is None:

     6          raise ImportError("No module named %s" % mod_name)

     7      if loader.is_package(mod_name):

     8 -        raise ImportError(("%s is a package and cannot " +

     9 -                          "be directly executed") % mod_name)

    10 +        try:

    11 +            return _get_module_details('.'.join((mod_name, '__main__')))

    12 +        except ImportError, e:

    13 +            raise ImportError(("%s; %s is a package and cannot " +

    14 +                               "be directly executed") %(e, mod_name))

    15      code = loader.get_code(mod_name)

    16      if code is None:

    17          raise ImportError("No code object available for %s" % mod_name)

    18      filename = _get_filename(loader, mod_name)