[Zope3-checkins] CVS: Zope3 - Makefile:1.29.2.1 README.txt:1.12.24.1 setup.py:1.28.2.1 test.py:1.59.2.1 z3.py:1.18.12.1 log.ini:NONE
Grégoire Weber
zope@i-con.ch
Sun, 22 Jun 2003 10:24:21 -0400
Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv24874
Modified Files:
Tag: cw-mail-branch
Makefile README.txt setup.py test.py z3.py
Removed Files:
Tag: cw-mail-branch
log.ini
Log Message:
Synced up with HEAD
=== Zope3/Makefile 1.29 => 1.29.2.1 ===
--- Zope3/Makefile:1.29 Tue May 13 15:26:31 2003
+++ Zope3/Makefile Sun Jun 22 10:22:19 2003
@@ -10,7 +10,7 @@
inplace:
$(PYTHON) setup.py $(SETUPFLAGS) build_ext -i
-build:
+build::
$(PYTHON) setup.py $(SETUPFLAGS) build
test_build: build
=== Zope3/README.txt 1.12 => 1.12.24.1 ===
--- Zope3/README.txt:1.12 Wed Jan 1 08:40:02 2003
+++ Zope3/README.txt Sun Jun 22 10:22:19 2003
@@ -12,7 +12,7 @@
Building and running tests
- Zope3 requires Python 2.2.2 or later and PyXML 0.8.1 or higher.
+ Zope3 requires Python 2.2.3 or later and PyXML 0.8.1 or higher.
PyXML can be downloaded from http://sf.net/projects/pyxml.
In the top-level Zope3 directory, you should find a script called
=== Zope3/setup.py 1.28 => 1.28.2.1 ===
--- Zope3/setup.py:1.28 Tue May 20 15:24:19 2003
+++ Zope3/setup.py Sun Jun 22 10:22:19 2003
@@ -68,7 +68,7 @@
# We have to snoop for file types that distutils doesn't copy correctly when
# doing a non-build-in-place.
-EXTS = ['.conf', '.css', '.dtd', '.gif', '.html',
+EXTS = ['.conf', '.css', '.dtd', '.gif', '.jpg', '.html',
'.js', '.mo', '.png', '.pt', '.stx', '.ref',
'.txt', '.xml', '.zcml', '.mar',
]
@@ -214,29 +214,33 @@
"src/persistence/persistenceAPI.h",]),
Extension("zodb._timestamp", ["src/zodb/_timestamp.c"]),
Extension("zodb.storage._helper", ["src/zodb/storage/_helper.c"]),
- Extension("zope.proxy.context.wrapper",
- ["src/zope/proxy/context/wrapper.c"],
- include_dirs = include_dirs,
- depends = ["src/zope/proxy/context/wrapper.h",
- "src/zope/proxy/proxy.h"]),
- Extension("zope.proxy.context.decorator",
- ["src/zope/proxy/context/decorator.c"],
+
+ Extension("zope.context.wrapper",
+ ["src/zope/context/wrapper.c"],
include_dirs = include_dirs,
- depends = ["src/zope/proxy/context/decorator.h",
- "src/zope/proxy/context/wrapper.h",
+ depends = ["src/zope/context/wrapper.h",
"src/zope/proxy/proxy.h"]),
- Extension("zope.proxy.proxy", ["src/zope/proxy/proxy.c"],
+
+ Extension("zope.proxy._zope_proxy_proxy",
+ ["src/zope/proxy/_zope_proxy_proxy.c"],
include_dirs = include_dirs,
depends = ["src/zope/proxy/proxy.h"]),
+
Extension("zope.security._proxy", ["src/zope/security/_proxy.c"],
include_dirs = include_dirs,
depends = ["src/zope/proxy/proxy.h"]),
+
Extension("zope.interface._zope_interface_ospec",
["src/zope/interface/_zope_interface_ospec.c"]),
+
Extension("zope.hookable._zope_hookable",
["src/zope/hookable/_zope_hookable.c"])
]
+if sys.version_info >= (2, 2):
+ ext_modules.append(Extension("pythonlib.compat22._csv",
+ ["src/pythonlib/compat22/_csv.c"]))
+
# On Window, there are more extensions that need to be built
if sys.platform == "win32":
ext_modules += [Extension("zodb.winlock", ["src/zodb/winlock.c"])]
@@ -255,7 +259,7 @@
headers = ["src/persistence/persistence.h",
"src/persistence/persistenceAPI.h",
"src/zope/proxy/proxy.h",
- "src/zope/proxy/context/wrapper.h"],
+ "src/zope/proxy/wrapper.h"],
license = "http://www.zope.org/Resources/ZPL",
platforms = ["any"],
description = doclines[0],
=== Zope3/test.py 1.59 => 1.59.2.1 ===
--- Zope3/test.py:1.59 Wed May 14 05:14:56 2003
+++ Zope3/test.py Sun Jun 22 10:22:19 2003
@@ -179,15 +179,19 @@
self.dots = False
self._progressWithNames = True
self._lastWidth = 0
+ self._maxWidth = 80
try:
import curses
except ImportError:
- self._maxWidth = 80
+ pass
else:
import curses.wrapper
def get_max_width(scr, self=self):
self._maxWidth = scr.getmaxyx()[1]
- curses.wrapper(get_max_width)
+ try:
+ curses.wrapper(get_max_width)
+ except curses.error:
+ pass
self._maxWidth -= len("xxxx/xxxx (xxx.x%): ") + 1
def stopTest(self, test):
@@ -370,8 +374,9 @@
class TestFileFinder:
def __init__(self, prefix):
self.files = []
- # XXX will break if prefix ends with a slash
- self._plen = len(prefix)+1
+ self._plen = len(prefix)
+ if not prefix.endswith(os.sep):
+ self._plen += 1
global functional
if functional:
self.dirname = "ftests"
@@ -418,11 +423,29 @@
mod = path.replace(os.sep, ".")
return mod
+def walk_with_symlinks(top, func, arg):
+ """Like os.path.walk, but follows symlinks on POSIX systems.
+
+ This could theoreticaly result in an infinite loop, if you create symlink
+ cycles in your Zope sandbox, so don't do that.
+ """
+ try:
+ names = os.listdir(top)
+ except os.error:
+ return
+ func(arg, top, names)
+ exceptions = ('.', '..')
+ for name in names:
+ if name not in exceptions:
+ name = os.path.join(top, name)
+ if os.path.isdir(name):
+ walk_with_symlinks(name, func, arg)
+
def find_tests(rx):
global finder
finder = TestFileFinder(pathinit.libdir)
walkdir = test_dir or pathinit.libdir
- os.path.walk(walkdir, finder.visit, rx)
+ walk_with_symlinks(walkdir, finder.visit, rx)
return finder.files
def package_import(modname):
=== Zope3/z3.py 1.18 => 1.18.12.1 ===
--- Zope3/z3.py:1.18 Tue Apr 22 08:08:13 2003
+++ Zope3/z3.py Sun Jun 22 10:22:19 2003
@@ -17,11 +17,14 @@
$Id$
"""
-import os, sys, time
+import os, sys, time, getopt
basepath = filter(None, sys.path)
def run(argv=sys.argv):
+
+
+
# Record start times (real time and CPU time)
t0 = time.time()
c0 = time.clock()
@@ -38,9 +41,17 @@
sys.exit(1)
# setting python paths
- program = argv[0]
+ program = argv.pop(0)
+ if argv == ['--build']:
+ from distutils.util import get_platform
+ PLAT_SPEC = "%s-%s" % (get_platform(), sys.version[0:3])
+ src = os.path.join("build", "lib.%s" % PLAT_SPEC)
+ else:
+ src='src'
+
+
here = os.path.join(os.getcwd(), os.path.split(program)[0])
- srcdir = os.path.abspath('src')
+ srcdir = os.path.abspath(src)
sys.path = [srcdir, here] + basepath
# Initialize the logging module.
=== Removed File Zope3/log.ini ===