the usual

4 files changed, 102 insertions, 7 deletions

diff --git a/BUGS b/BUGS
index 730fb94..ed97f06 100644
--- a/BUGS
+++ b/BUGS
@@ -9,6 +9,10 @@ nother to make an entry in this file, unless it was a serious bug
 
 ======================================================================
 
+(-) "f()=0" generates syntax error msg without line number
+
+======================================================================
+
 Known BUGS in 1.2 BETA 1, fixed in 1.2 BETA 2
 ---------------------------------------------
 
diff --git a/ChangeLog b/ChangeLog
index 5eed75b..c72486a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,81 @@
+
+========================================
+==> Release 1.2 BETA 4 (21 Mar 1995) <==
+========================================
+
+Tue Mar 21 13:28:32 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Python/ceval.c (call_object): removed #ifdef'ed out code
+
+Mon Mar 20 17:14:14 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Lib/copy.py (_copy_dispatch): fix typo in hasattr() exprs
+
+Sat Mar 18 00:04:14 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Makefile.in: change -f Makefile.in to -f $(srcdir)/Makefile.in
+
+Fri Mar 17 10:52:07 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Lib/tkinter/Tkinter.py: add TkVersion and TclVersion variables;
+	handle crash in callback different (don't drop into debugger); add
+	_getdoubles() and streamline _getints()
+
+	* Doc/lib*.tex: mass update
+
+	* Doc/partparse.py: fix several small things so it doesn't crash
+	so easily
+
+	* Modules/threadmodule.c: change exit_thread so it raises
+	SystemExit -- this allow proper cleanup in t_bootstrap
+
+	* Makefile.in (distclean): add -f Makefile.in (John Interrante)
+
+Thu Mar 16 13:35:25 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Doc/ref*.tex: made palatable to latex2html -- basically rewrote
+	all math using \code{} and \var{} (and pow() and some integer
+	literals), and added braces to some \item[]s containing \tt
+
+	* Modules/socketmodule.c: fixed up comments describing interface
+
+	* Lib/test/test_signal.py: new module to test signal module
+
+Wed Mar 15 11:07:43 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Modules/signalmodule.c (PySignal_Signal): use PyCallable_Check
+	where suitable; split some lines
+
+	* Lib/posixfile.py (open) defaults mode='r', bufsize=-1
+
+Tue Mar 14 10:42:39 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Lib/copy.py: rename copy.Error to copy.error
+
+	* Lib/cgi.py: correct some typos that broke escape() and print_form()
+
+	* Lib/string.py: add (unsupported) optional base argument to
+	atoi() and atol(); be more careful about very negative start
+	indices in [r]find() and count()
+
+	* Modules/timemodule.c: tiny additions for Windows 3.1
+
+	* Modules/gdbmmodule.c: plugged some memory leaks (Steve Clift)
+
+	* Modules/socketmodule.c (makefile): made mode optional and added
+	optional buffer size, like built-in open()
+
+Mon Mar 13 11:26:20 1995  Guido van Rossum  <guido@voorn.cwi.nl>
+
+	* Lib/pickle.py: added ability to pickle classes (could be used
+	for exceptions in RPC); made format_version non-hidden variable,
+	added compatible_formats variable, added shorthand functions
+	dump(), load(), dumps() and loads() -- similar to marshal
+
+	* Python/pythonrun.c (fatal): In NT, write msg to debugging device
+
+	* Doc/lib*.tex: small changes by Soren Larsen
+
 Thu Mar  9 15:06:02 1995  Guido van Rossum  <guido@voorn.cwi.nl>
 
 	* Lib/pickle.py: added explicit exception for unpicklable object
diff --git a/Makefile.in b/Makefile.in
index 7d09e35..9319bad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -237,13 +237,14 @@ clobber:	localclobber
 			(echo $$i; cd $$i; \
 			 if test -f Makefile; \
 			 then $(MAKE) clobber; \
-			 else $(MAKE) -f Makefile.in clobber; \
+			 else $(MAKE) -f $(srcdir)/Makefile.in clobber; \
 			 fi); \
 		done
 
 # Make things extra clean, before making a distribution
 distclean:	clobber
-		-$(MAKE) SUBDIRS="$(SUBDIRSTOO)" clobber
+		-$(MAKE) -f $(srcdir)/Makefile.in \
+			SUBDIRS="$(SUBDIRSTOO)" clobber
 		-rm -f config.status config.log config.cache config.h Makefile
 		-for i in $(SUBDIRS) $(SUBDIRSTOO); do \
 			 for f in $$i/*.in; do \
diff --git a/TODO b/TODO
index 35280a2..87b3184 100644
--- a/TODO
+++ b/TODO
@@ -1,20 +1,32 @@
-(-) always use my getopt.c
+(-) support lists in newgetargs()
 
-(-) get Extensions/X11/Doc checked in and out
+(-) syntax errors detected during compilation should give line number
+
+(-) dbm.open(): rwmode, filemode should be made optional; same for gdbm
+
+(-) find a bsd hash interface
+
+(-) posix.mkdir(): mode should be made optional
+
+(-) find a more useful order than alphabetical for Doc/libfuncs.tex
+
+======================================================================
+
+(*) use my getopt.c on Linux
+
+(*) get Extensions/X11/Doc checked in and out
 
 (-) investigate PPRC <URL:ftp://ftp.parc.xerox.com/pub/ppcr/>
 
 (*) add buffering parameter to fdopen() and popen()
 
-(-) "f()=0" generates syntax error msg without line number
-
 (-) interface to getdtablesize() in posix
 
 (-) reentrancy with global variables vs. decref in
 ./Modules/cdmodule.c ./Modules/flmodule.c ./Objects/accessobject.c
 ./Objects/frameobject.c ./Python/traceback.c
 
-(-) check reentrancy in list updates?
+(*) fix reentrancy in list updates?
 
 (-) speed up regsub.gsub