Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/RISCOS/Modules/config.c

    r2 r391  
    5050struct _inittab _PyImport_Inittab[] = {
    5151
    52         {"riscos", initriscos},
     52    {"riscos", initriscos},
    5353
    5454/* -- ADDMODULE MARKER 2 -- */
    5555
    56         /* This module "lives in" with marshal.c */
    57         {"marshal", PyMarshal_Init},
     56    /* This module "lives in" with marshal.c */
     57    {"marshal", PyMarshal_Init},
    5858
    59         /* This lives it with import.c */
    60         {"imp", initimp},
     59    /* This lives it with import.c */
     60    {"imp", initimp},
    6161
    62         /* These entries are here for sys.builtin_module_names */
    63         {"__main__", NULL},
    64         {"__builtin__", NULL},
    65         {"sys", NULL},
    66         {"exceptions", NULL},
     62    /* These entries are here for sys.builtin_module_names */
     63    {"__main__", NULL},
     64    {"__builtin__", NULL},
     65    {"sys", NULL},
     66    {"exceptions", NULL},
    6767
    68         /* This lives in gcmodule.c */
    69         {"gc", initgc},
     68    /* This lives in gcmodule.c */
     69    {"gc", initgc},
    7070
    71         /* Sentinel */
    72         {0, 0}
     71    /* Sentinel */
     72    {0, 0}
    7373};
Note: See TracChangeset for help on using the changeset viewer.