summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-01-04 19:21:21 (GMT)
committerGuido van Rossum <guido@python.org>1995-01-04 19:21:21 (GMT)
commit227a0a1e2d05596d706c2840e6fb407472075e72 (patch)
tree7f9c51b2e84bdd6fe36d05fa1c0b2fd352ec7ce0
parentf456b6d691b7d6a38d2f48e1da216ba1d4340ce7 (diff)
downloadcpython-227a0a1e2d05596d706c2840e6fb407472075e72.zip
cpython-227a0a1e2d05596d706c2840e6fb407472075e72.tar.gz
cpython-227a0a1e2d05596d706c2840e6fb407472075e72.tar.bz2
Added 1995 to copyright message; added a few people to acks again...
-rw-r--r--Misc/ACKS4
-rw-r--r--Misc/COPYRIGHT4
-rwxr-xr-xMisc/Fixcprt.py12
-rw-r--r--Misc/python.man12
4 files changed, 20 insertions, 12 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 40f2e73..081cc9d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -25,8 +25,9 @@ Jan-Hein B"uhrman
Dick Bulterman
Tommy Burnette
Mike Carlton
-Matthew Conway
David Chaum
+Matt Conway
+Tom Culliton
John Cugini
Jonathan Dasteel
John DeGood
@@ -102,6 +103,7 @@ Frank Visser
Richard Walker
Barry Warsaw
Steve Waterbury
+Bob Watson
Rickard Westman
Dik Winter
tim@prl.philips.nl
diff --git a/Misc/COPYRIGHT b/Misc/COPYRIGHT
index 56a1b93..4d6bc30 100644
--- a/Misc/COPYRIGHT
+++ b/Misc/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Misc/Fixcprt.py b/Misc/Fixcprt.py
index 7b447fb..fa28aaa 100755
--- a/Misc/Fixcprt.py
+++ b/Misc/Fixcprt.py
@@ -8,12 +8,18 @@ import os
import stat
import getopt
-oldcprt = 'Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,\nAmsterdam, The Netherlands.'
-newcprt = 'Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,\nAmsterdam, The Netherlands.'
+oldcprt = """\
+Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands."""
+newcprt = """\
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands."""
oldprog = regex.compile(oldcprt)
newprog = regex.compile(newcprt)
+HEADSIZE = 1024
+
def main():
opts, args = getopt.getopt(sys.argv[1:], 'y:')
agelimit = 0L
@@ -36,7 +42,7 @@ def main():
except IOError, msg:
print file, ': open failed :', msg
continue
- head = f.read(1024)
+ head = f.read(HEADSIZE)
if oldprog.search(head) < 0:
if newprog.search(head) < 0:
print file, ': NO COPYRIGHT FOUND'
diff --git a/Misc/python.man b/Misc/python.man
index 483bea1..4e7d46a 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -1,4 +1,4 @@
-.TH PYTHON "3 May 1994"
+.TH PYTHON "4 January 1995"
.SH NAME
python \- an interpreted, interactive, object-oriented programming language
.SH SYNOPSIS
@@ -221,15 +221,15 @@ To subscribe, send mail containing your real name and e-mail address
in Internet form to
.I python-list-request@cwi.nl.
.SH COPYRIGHT
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
.IP " "
All Rights Reserved
.PP
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.