fix Alpha bug in (x)range; different __builtins__ initialization

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index b3ac3c6a555cf7a2e5ff81d351a766e44f20ca49..dbf201e66d7563a8dcdbd4efbe53e8571c6b5061 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1011,13 +1011,13 @@ builtin_range(self, args)
 
        if (gettuplesize(args) <= 1) {
                if (!newgetargs(args,
-                               "i;range() requires 1-3 int arguments",
+                               "l;range() requires 1-3 int arguments",
                                &ihigh))
                        return NULL;
        }
        else {
                if (!newgetargs(args,
-                               "ii|i;range() requires 1-3 int arguments",
+                               "ll|l;range() requires 1-3 int arguments",
                                &ilow, &ihigh, &istep))
                        return NULL;
        }
@@ -1053,18 +1053,18 @@ builtin_xrange(self, args)
        object *args;
 {
        long ilow = 0, ihigh = 0, istep = 1;
-       int n;
+       long n;
        object *v;
 
        if (gettuplesize(args) <= 1) {
                if (!newgetargs(args,
-                               "i;xrange() requires 1-3 int arguments",
+                               "l;xrange() requires 1-3 int arguments",
                                &ihigh))
                        return NULL;
        }
        else {
                if (!newgetargs(args,
-                               "ii|i;xrange() requires 1-3 int arguments",
+                               "ll|l;xrange() requires 1-3 int arguments",
                                &ilow, &ihigh, &istep))
                        return NULL;
        }
@@ -1382,8 +1382,15 @@ static struct methodlist builtin_methods[] = {
        {NULL,          NULL},
 };
 
+static object *builtin_mod;
 static object *builtin_dict;
 
+object *
+getbuiltinmod()
+{
+       return builtin_mod;
+}
+
 object *
 getbuiltindict()
 {
@@ -1449,9 +1456,8 @@ initerrors()
 void
 initbuiltin()
 {
-       object *m;
-       m = initmodule("__builtin__", builtin_methods);
-       builtin_dict = getmoduledict(m);
+       builtin_mod = initmodule("__builtin__", builtin_methods);
+       builtin_dict = getmoduledict(builtin_mod);
        INCREF(builtin_dict);
        initerrors();
        (void) dictinsert(builtin_dict, "None", None);