Patch #734231: Update RiscOS support. In particular, correct

loewis · loewis · commit a94568a7535d · 2003-05-10T07:36:56.000Z
riscospath.extsep, and use os.extsep throughout.
diff --git a/Include/pyport.h b/Include/pyport.h
@@ -147,6 +147,7 @@ typedef PY_LONG_LONG		Py_intptr_t;
 
 #ifdef RISCOS
 #include <sys/types.h>
+#include "unixstuff.h"
 #endif
 
 #ifndef DONT_HAVE_SYS_STAT_H
diff --git a/Lib/plat-riscos/riscospath.py b/Lib/plat-riscos/riscospath.py
@@ -15,7 +15,7 @@
 # strings representing various path-related bits and pieces
 curdir = '@'
 pardir = '^'
-extsep = '.'
+extsep = '/'
 sep = '.'
 pathsep = ','
 defpath = '<Run$Dir>'
diff --git a/Lib/site.py b/Lib/site.py
@@ -162,7 +162,7 @@ def addpackage(sitedir, name):
     prefixes.append(sys.exec_prefix)
 for prefix in prefixes:
     if prefix:
-        if sys.platform == 'os2emx':
+        if sys.platform in ('os2emx', 'riscos'):
             sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
         elif os.sep == '/':
             sitedirs = [os.path.join(prefix,
diff --git a/Lib/socket.py b/Lib/socket.py
@@ -96,7 +96,6 @@ def ssl(sock, keyfile=None, certfile=None):
     errorTab[10065] = "The host is unreachable."
     __all__.append("errorTab")
 
-del os, sys
 
 
 def getfqdn(name=''):
@@ -139,6 +138,9 @@ def getfqdn(name=''):
     'sendall', 'setblocking',
     'settimeout', 'gettimeout', 'shutdown')
 
+if sys.platform == "riscos":
+    _socketmethods = _socketmethods + ('sleeptaskw',)
+
 class _closedsocket(object):
     __slots__ = []
     def _dummy(*args):
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
@@ -726,8 +726,10 @@ def printlist(x, width=70, indent=4):
         """
         test_al
         test_asynchat
+        test_atexit
         test_bsddb
         test_bsddb185
+        test_bsddb3
         test_cd
         test_cl
         test_commands
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
@@ -11,7 +11,7 @@
 import bz2
 from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor
 
-has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx")
+has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx", "riscos")
 
 class BaseTest(unittest.TestCase):
     "Base for other testcases."
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
@@ -3,7 +3,7 @@
 from test.test_support import TestFailed, TESTFN, unlink
 from types import ClassType
 import warnings
-import sys, traceback
+import sys, traceback, os
 
 print '5. Built-in exceptions'
 # XXX This is not really enough, each *operation* should be tested!
@@ -185,7 +185,7 @@ def test_capi1():
         exc, err, tb = sys.exc_info()
         co = tb.tb_frame.f_code
         assert co.co_name == "test_capi1"
-        assert co.co_filename.endswith('test_exceptions.py')
+        assert co.co_filename.endswith('test_exceptions'+os.extsep+'py')
     else:
         print "Expected exception"
 
@@ -197,7 +197,7 @@ def test_capi2():
         exc, err, tb = sys.exc_info()
         co = tb.tb_frame.f_code
         assert co.co_name == "__init__"
-        assert co.co_filename.endswith('test_exceptions.py')
+        assert co.co_filename.endswith('test_exceptions'+os.extsep+'py')
         co2 = tb.tb_frame.f_back.f_code
         assert co2.co_name == "test_capi2"
     else:
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
@@ -78,7 +78,7 @@ def test_with_extension(ext): # ext normally ".py"; perhaps ".pyw"
 
 def test_module_with_large_stack(module):
     # create module w/list of 65000 elements to test bug #561858
-    filename = module + '.py'
+    filename = module + os.extsep + 'py'
 
     # create a file with a list of 65000 elements
     f = open(filename, 'w+')
@@ -102,8 +102,8 @@ def test_module_with_large_stack(module):
 
     # cleanup
     del sys.path[-1]
-    for ext in '.pyc', '.pyo':
-        fname = module + ext
+    for ext in 'pyc', 'pyo':
+        fname = module + os.extsep + ext
         if os.path.exists(fname):
             os.unlink(fname)
 
diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py
@@ -3,7 +3,7 @@
 import os
 from unicodedata import normalize
 
-TESTDATAFILE = "NormalizationTest.txt"
+TESTDATAFILE = "NormalizationTest" + os.extsep + "txt"
 
 # This search allows using a build directory just inside the source
 # directory, and saving just one copy of the test data in the source
diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
@@ -42,7 +42,7 @@ def fileno(self):
 
 def test():
     import sys
-    if sys.platform[:3] in ('win', 'mac', 'os2'):
+    if sys.platform[:3] in ('win', 'mac', 'os2', 'riscos'):
         if verbose:
             print "Can't test select easily on", sys.platform
         return
diff --git a/Lib/test/test_shelve.py b/Lib/test/test_shelve.py
@@ -6,7 +6,7 @@
 
 class TestCase(unittest.TestCase):
 
-    fn = "shelftemp.db"
+    fn = "shelftemp" + os.extsep + "db"
 
     def test_ascii_file_shelf(self):
         try:
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
@@ -56,14 +56,14 @@ def forget(modname):
     import os
     for dirname in sys.path:
         try:
-            os.unlink(os.path.join(dirname, modname + '.pyc'))
+            os.unlink(os.path.join(dirname, modname + os.extsep + 'pyc'))
         except os.error:
             pass
         # Deleting the .pyo file cannot be within the 'try' for the .pyc since
         # the chance exists that there is no .pyc (and thus the 'try' statement
         # is exited) but there is a .pyo file.
         try:
-            os.unlink(os.path.join(dirname, modname + '.pyo'))
+            os.unlink(os.path.join(dirname, modname + os.extsep + 'pyo'))
         except os.error:
             pass
 
@@ -118,7 +118,9 @@ def fcmp(x, y): # fuzzy comparison function
 if os.name == 'java':
     # Jython disallows @ in module names
     TESTFN = '$test'
-elif os.name != 'riscos':
+elif os.name == 'riscos':
+    TESTFN = 'testfile'
+else:
     TESTFN = '@test'
     # Unicode name only used if TEST_FN_ENCODING exists for the platform.
     if have_unicode:
@@ -129,8 +131,6 @@ def fcmp(x, y): # fuzzy comparison function
         else:
             TESTFN_UNICODE=unicode("@test-\xe0\xf2", "latin-1") # 2 latin characters.
         TESTFN_ENCODING=sys.getfilesystemencoding()
-else:
-    TESTFN = 'test'
 
 # Make sure we can write to TESTFN, try in /tmp if we can't
 fp = None
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
@@ -21,15 +21,15 @@
 def path(path):
     return test_support.findfile(path)
 
-testtar = path("testtar.tar")
-tempdir = path("testtar.dir")
-tempname = path("testtar.tmp")
+testtar = path("testtar" + os.extsep + "tar")
+tempdir = path("testtar" + os.extsep + "dir")
+tempname = path("testtar" + os.extsep + "tmp")
 membercount = 10
 
 def tarname(comp=""):
     if not comp:
         return testtar
-    return "%s.%s" % (testtar, comp)
+    return "%s%s%s" % (testtar, os.extsep, comp)
 
 def dirname():
     if not os.path.exists(tempdir):
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
@@ -37,7 +37,7 @@ def make_pyc(co, mtime):
 TESTMOD = "ziptestmodule"
 TESTPACK = "ziptestpackage"
 TESTPACK2 = "ziptestpackage2"
-TEMP_ZIP = os.path.abspath("junk95142.zip")
+TEMP_ZIP = os.path.abspath("junk95142" + os.extsep + "zip")
 
 class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
 
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -221,9 +221,11 @@ typedef size_t socklen_t;
 # ifndef RISCOS
 #  include <fcntl.h>
 # else
-#  include <sys/fcntl.h>
+#  include <sys/ioctl.h>
+#  include <socklib.h>
 #  define NO_DUP
 int h_errno; /* not used */
+#  define INET_ADDRSTRLEN 16
 # endif
 
 #else
@@ -464,6 +466,18 @@ set_error(void)
 	}
 #endif
 
+#if defined(RISCOS)
+	if (_inet_error.errnum != NULL) {
+		PyObject *v;
+		v = Py_BuildValue("(is)", errno, _inet_err());
+		if (v != NULL) {
+			PyErr_SetObject(socket_error, v);
+			Py_DECREF(v);
+		}
+		return NULL;
+	}
+#endif
+
 	return PyErr_SetFromErrno(socket_error);
 }
 
@@ -548,8 +562,11 @@ internal_setblocking(PySocketSockObject *s, int block)
 	block = !block;
 	ioctlsocket(s->sock_fd, FIONBIO, (u_long*)&block);
 #endif /* MS_WINDOWS */
-#endif /* __BEOS__ */
+#else /* RISCOS */
+	block = !block;
+	socketioctl(s->sock_fd, FIONBIO, (u_long*)&block);
 #endif /* RISCOS */
+#endif /* __BEOS__ */
 	Py_END_ALLOW_THREADS
 
 	/* Since these don't return anything */
@@ -1211,11 +1228,11 @@ operations are disabled.");
 /* s.sleeptaskw(1 | 0) method */
 
 static PyObject *
-sock_sleeptaskw(PySocketSockObject *s,PyObject *args)
+sock_sleeptaskw(PySocketSockObject *s,PyObject *arg)
 {
 	int block;
-	int delay_flag;
-	if (!PyArg_Parse(args, "i", &block))
+	block = PyInt_AsLong(arg);
+	if (block == -1 && PyErr_Occurred())
 		return NULL;
 	Py_BEGIN_ALLOW_THREADS
 	socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
@@ -2056,7 +2073,7 @@ static PyMethodDef sock_methods[] = {
 	{"shutdown",	(PyCFunction)sock_shutdown, METH_O,
 			shutdown_doc},
 #ifdef RISCOS
-	{"sleeptaskw",	(PyCFunction)sock_sleeptaskw, METH_VARARGS,
+	{"sleeptaskw",	(PyCFunction)sock_sleeptaskw, METH_O,
 	 		sleeptaskw_doc},
 #endif
 	{NULL,			NULL}		/* sentinel */
@@ -2858,8 +2875,11 @@ socket_inet_pton(PyObject *self, PyObject *args)
 	int af;
 	char* ip;
 	int retval;
+#ifdef ENABLE_IPV6
 	char packed[MAX(sizeof(struct in_addr), sizeof(struct in6_addr))];
-
+#else
+	char packed[sizeof(struct in_addr)];
+#endif
 	if (!PyArg_ParseTuple(args, "is:inet_pton", &af, &ip)) {
 		return NULL;
 	}
@@ -2875,9 +2895,11 @@ socket_inet_pton(PyObject *self, PyObject *args)
 	} else if (af == AF_INET) {
 		return PyString_FromStringAndSize(packed,
 			sizeof(struct in_addr));
+#ifdef ENABLE_IPV6
 	} else if (af == AF_INET6) {
 		return PyString_FromStringAndSize(packed,
 			sizeof(struct in6_addr));
+#endif
 	} else {
 		PyErr_SetString(socket_error, "unknown address family");
 		return NULL;
@@ -2896,7 +2918,11 @@ socket_inet_ntop(PyObject *self, PyObject *args)
 	char* packed;
 	int len;
 	const char* retval;
+#ifdef ENABLE_IPV6
 	char ip[MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1];
+#else
+	char ip[INET_ADDRSTRLEN + 1];
+#endif
 	
 	/* Guarantee NUL-termination for PyString_FromString() below */
 	memset((void *) &ip[0], '\0', sizeof(ip) + 1);
@@ -2911,12 +2937,14 @@ socket_inet_ntop(PyObject *self, PyObject *args)
 				"invalid length of packed IP address string");
 			return NULL;
 		}
+#ifdef ENABLE_IPV6
 	} else if (af == AF_INET6) {
 		if (len != sizeof(struct in6_addr)) {
 			PyErr_SetString(PyExc_ValueError,
 				"invalid length of packed IP address string");
 			return NULL;
 		}
+#endif
 	} else {
 		PyErr_Format(PyExc_ValueError,
 			"unknown address family %d", af);
@@ -3235,7 +3263,7 @@ os_init(void)
 	_kernel_swi(0x43380, &r, &r);
 	taskwindow = r.r[0];
 
-	return 0;
+	return 1;
 }
 
 #endif /* RISCOS */
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -78,6 +78,10 @@ static long main_thread;
 #include <kernel/OS.h>
 #endif
 
+#ifdef RISCOS
+extern int riscos_sleep(double);
+#endif
+
 /* Forward declarations */
 static int floatsleep(double);
 static double floattime(void);
@@ -944,7 +948,7 @@ floatsleep(double secs)
 		return 0;
 	Py_BEGIN_ALLOW_THREADS
 	/* This sleep *CAN BE* interrupted. */
-	if ( sleep(secs) )
+	if ( riscos_sleep(secs) )
 		return -1;
 	Py_END_ALLOW_THREADS
 #elif defined(PLAN9)
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
@@ -91,6 +91,7 @@ zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds)
 	path = NULL;
 	prefix = NULL;
 	for (;;) {
+#ifndef RISCOS
 		struct stat statbuf;
 		int rv;
 
@@ -102,6 +103,15 @@ zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds)
 				path = buf;
 			break;
 		}
+#else
+		if (object_exists(buf)) {
+			/* it exists */
+			if (isfile(buf))
+				/* it's a file */
+				path = buf;
+			break;
+		}
+#endif
 		/* back up one path element */
 		p = strrchr(buf, SEP);
 		if (prefix != NULL)
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -5086,7 +5086,7 @@ update_one_slot(PyTypeObject *type, slotdef *p)
 			   sanity checks and constructing a new argument
 			   list.  Cut all that nonsense short -- this speeds
 			   up instance creation tremendously. */
-			specific = type->tp_new;
+			specific = (void *)type->tp_new;
 			/* XXX I'm not 100% sure that there isn't a hole
 			   in this reasoning that requires additional
 			   sanity checks.  I'll buy the first person to
diff --git a/Parser/grammar.c b/Parser/grammar.c
@@ -9,6 +9,10 @@
 #include "token.h"
 #include "grammar.h"
 
+#ifdef RISCOS
+#include <unixlib.h>
+#endif
+
 extern int Py_DebugFlag;
 
 grammar *
diff --git a/Python/compile.c b/Python/compile.c
diff --git a/RISCOS/Makefile b/RISCOS/Makefile
diff --git a/RISCOS/Modules/riscosmodule.c b/RISCOS/Modules/riscosmodule.c
diff --git a/RISCOS/Modules/swimodule.c b/RISCOS/Modules/swimodule.c
diff --git a/RISCOS/pyconfig.h b/RISCOS/pyconfig.h
diff --git a/RISCOS/sleep.c b/RISCOS/sleep.c
diff --git a/RISCOS/support/!Boot b/RISCOS/support/!Boot
diff --git a/RISCOS/support/!Run b/RISCOS/support/!Run
