Mailman 3 December 2003 - Python-checkins

python/nondist/sandbox/parrotbench b5.py, 1.2, 1.3 out5, 1.3, 1.4
by gvanrossum＠users.sourceforge.net Dec. 31, 2003

Dec. 31, 2003

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv23820 Modified Files: b5.py out5 Log Message: More fun with encode() and decode(). Index: b5.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b5.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** b5.py 31 Dec 2003 06:16:46 -0000 1.2 --- b5.py 31 Dec 2003 06:43:47 -0000 1.3 *************** *** 175,183 **** check(unicode("abc"), u"abc") ! check(unicode("abc", "ascii"), u"abc") check(unicode("abc\xff", "Latin-1"), u"abc\u00ff") check(unicode("abc\xc3\xbf", "utf8"), u"abc\xff") ! exception(UnicodeError, unicode, "abc\xff", "ascii") ! exception(UnicodeError, unicode, "abc\xff", "utf-8") check(list(xrange(10)), range(10)) --- 175,195 ---- check(unicode("abc"), u"abc") ! check("abc".decode(), u"abc") ! check(unicode("abc", "ASCII"), u"abc") ! check("abc".decode("646"), u"abc") check(unicode("abc\xff", "Latin-1"), u"abc\u00ff") + check("abc\xff".decode("latin-1"), u"abc\u00ff") check(unicode("abc\xc3\xbf", "utf8"), u"abc\xff") ! check("abc\xc3\xbf".decode("Utf8"), u"abc\xff") ! exception(UnicodeError, unicode, "abc\xff") ! exception(UnicodeError, "abc\xff".decode) ! exception(UnicodeError, unicode, "abc\xff", "us_ascii") ! exception(UnicodeError, "abc\xff".decode, "Ascii") ! exception(UnicodeError, unicode, "abc\xff", "UTF-8") ! exception(UnicodeError, "abc\xff".decode, "utf8") ! check(u"abc\xff".encode("utf-8"), "abc\xc3\xbf") ! check(u"abc\xff".encode("latin1"), "abc\377") ! exception(UnicodeError, u"abc\xff".encode, "Ascii") ! check(u"abc".encode("us"), "abc") check(list(xrange(10)), range(10)) Index: out5 =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out5,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** out5 31 Dec 2003 06:17:16 -0000 1.3 --- out5 31 Dec 2003 06:43:47 -0000 1.4 *************** *** 121,128 **** u'abc' == u'abc' u'abc' == u'abc' u'abc\xff' == u'abc\xff' u'abc\xff' == u'abc\xff' ! unicode('abc\xff', 'ascii') raised UnicodeError ! unicode('abc\xff', 'utf-8') raised UnicodeError [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] == [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] [('a', 'd'), ('b', 'e'), ('c', 'f')] == [('a', 'd'), ('b', 'e'), ('c', 'f')] --- 121,140 ---- u'abc' == u'abc' u'abc' == u'abc' + u'abc' == u'abc' + u'abc' == u'abc' u'abc\xff' == u'abc\xff' u'abc\xff' == u'abc\xff' ! u'abc\xff' == u'abc\xff' ! u'abc\xff' == u'abc\xff' ! unicode('abc\xff',) raised UnicodeError ! decode() raised UnicodeError ! unicode('abc\xff', 'us_ascii') raised UnicodeError ! decode('Ascii',) raised UnicodeError ! unicode('abc\xff', 'UTF-8') raised UnicodeError ! decode('utf8',) raised UnicodeError ! 'abc\xc3\xbf' == 'abc\xc3\xbf' ! 'abc\xff' == 'abc\xff' ! encode('Ascii',) raised UnicodeError ! 'abc' == 'abc' [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] == [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] [('a', 'd'), ('b', 'e'), ('c', 'f')] == [('a', 'd'), ('b', 'e'), ('c', 'f')]

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.148, 1.149
by gvanrossum＠users.sourceforge.net Dec. 31, 2003

Dec. 31, 2003

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv22243 Modified Files: libstdtypes.tex Log Message: Correct misrepresentation of print (it uses str(), not `...` for conversion). Hopefully I've not messed up the formatting. Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.148 retrieving revision 1.149 diff -C2 -d -r1.148 -r1.149 *** libstdtypes.tex 30 Dec 2003 22:21:18 -0000 1.148 --- libstdtypes.tex 31 Dec 2003 06:32:38 -0000 1.149 *************** *** 14,20 **** Some operations are supported by several object types; in particular, ! all objects can be compared, tested for truth value, and converted to ! a string (with the \code{`\textrm{\ldots}`} notation). The latter ! conversion is implicitly used when an object is written by the \keyword{print}\stindex{print} statement. (Information on \ulink{\keyword{print} statement}{../ref/print.html} --- 14,22 ---- Some operations are supported by several object types; in particular, ! practically all objects can be compared, tested for truth value, ! and converted to a string (with the \code{`\textrm{\ldots}`} notation, ! the equivalent \function{repr()} function, or the slightly different ! \function{str()} function). The latter ! function is implicitly used when an object is written by the \keyword{print}\stindex{print} statement. (Information on \ulink{\keyword{print} statement}{../ref/print.html}

1 0

[Python-checkins] python/nondist/sandbox/parrotbench Makefile, NONE, 1.1 out, NONE, 1.1
by gvanrossum＠users.sourceforge.net Dec. 31, 2003

Dec. 31, 2003

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv21523 Added Files: Makefile out Log Message: Added a Makefile, and an overall output file. --- NEW FILE: Makefile --- time: time python -O b.py >@out cmp @out out cmp: python -O b.py >@out cmp @out out diff: python -O b.py >@out diff @out out clean: -rm -f @* times: for i in 0 1 2 3 4 5; do \ echo b$$i.py; \ time python b$$i.py >@out$$i; \ cmp @out$$i out$$i; \ done cmps: for i in 0 1 2 3 4 5; do \ echo b$$i.py; \ python b$$i.py >@out$$i; \ cmp @out$$i out$$i; \ done diffs: for i in 0 1 2 3 4 5; do \ echo b$$i.py; \ python b$$i.py >@out$$i; \ diff @out$$i out$$i; \ done all: out out0 out1 out2 out3 out4 out5 out: b.py b?.py python -O b.py >out out0: b0.py python b0.py >out0 out1: b1.py python b1.py >out1 out2: b2.py python b2.py >out2 out3: b3.py python b3.py >out3 out4: b4.py python b4.py >out4 out5: b5.py python b5.py >out5 --- NEW FILE: out --- 3141592653 3141592653 997 997 0 3 1 4 1 5 9 2 6 5 3 5 8 9 7 9 3 2 3 8 4 6 2 6 4 3 3 8 3 2 7 9 5 0 2 8 8 4 1 9 7 1 6 9 3 9 9 3 7 5 1 0 5 8 2 0 9 7 4 9 4 4 5 9 2 3 0 7 8 1 6 4 0 6 2 8 6 2 0 8 9 9 8 6 2 8 0 3 4 8 2 5 3 4 2 1 1 7 0 6 7 9 8 2 1 4 8 0 8 6 5 1 3 2 8 2 3 0 6 6 4 7 0 9 3 8 4 4 6 0 9 5 5 0 5 8 2 2 3 1 7 2 5 3 5 9 4 0 8 1 2 8 4 8 1 1 1 7 4 5 0 2 8 4 1 0 2 7 0 1 9 3 8 5 2 1 1 0 5 5 5 9 6 4 4 6 2 2 9 4 8 9 5 4 9 3 0 3 8 1 9 6 4 4 2 8 8 1 0 9 7 5 6 6 5 9 3 3 4 4 6 1 2 8 4 7 5 6 4 8 2 3 3 7 8 6 7 8 3 1 6 5 2 7 1 2 0 1 9 0 9 1 4 5 6 4 8 5 6 6 9 2 3 4 6 0 3 4 8 6 1 0 4 5 4 3 2 6 6 4 8 2 1 3 3 9 3 6 0 7 2 6 0 2 4 9 1 4 1 2 7 3 7 2 4 5 8 7 0 0 6 6 0 6 3 1 5 5 8 8 1 7 4 8 8 1 5 2 0 9 2 0 9 6 2 8 2 9 2 5 4 0 9 1 7 1 5 3 6 4 3 6 7 8 9 2 5 9 0 3 6 0 0 1 1 3 3 0 5 3 0 5 4 8 8 2 0 4 6 6 5 2 1 3 8 4 1 4 6 9 5 1 9 4 1 5 1 1 6 0 9 4 3 3 0 5 7 2 7 0 3 6 5 7 5 9 5 9 1 9 5 3 0 9 2 1 8 6 1 1 7 3 8 1 9 3 2 6 1 1 7 9 3 1 0 5 1 1 8 5 4 8 0 7 4 4 6 2 3 7 9 9 6 2 7 4 9 5 6 7 3 5 1 8 8 5 7 5 2 7 2 4 8 9 1 2 2 7 9 3 8 1 8 3 0 1 1 9 4 9 1 2 9 8 3 3 6 7 3 3 6 2 4 4 0 6 5 6 6 4 3 0 8 6 0 2 1 3 9 4 9 4 6 3 9 5 2 2 4 7 3 7 1 9 0 7 0 2 1 7 9 8 6 0 9 4 3 7 0 2 7 7 0 5 3 9 2 1 7 1 7 6 2 9 3 1 7 6 7 5 2 3 8 4 6 7 4 8 1 8 4 6 7 6 6 9 4 0 5 1 3 2 0 0 0 5 6 8 1 2 7 1 4 5 2 6 3 5 6 0 8 2 7 7 8 5 7 7 1 3 4 2 7 5 7 7 8 9 6 0 9 1 7 3 6 3 7 1 7 8 7 2 1 4 6 8 4 4 0 9 0 1 2 2 4 9 5 3 4 3 0 1 4 6 5 4 9 5 8 5 3 7 1 0 5 0 7 9 2 2 7 9 6 8 9 2 5 8 9 2 3 5 4 2 0 1 9 9 5 6 1 1 2 1 2 9 0 2 1 9 6 0 8 6 4 0 3 4 4 1 8 1 5 9 8 1 3 6 2 9 7 7 4 7 7 1 3 0 9 9 6 0 5 1 8 7 0 7 2 1 1 3 4 9 9 9 9 9 9 8 3 7 2 9 7 8 0 4 9 9 5 1 0 5 9 7 3 1 7 3 2 8 1 6 0 9 6 3 1 8 5 9 5 0 2 4 4 5 9 4 5 5 3 4 6 9 0 8 3 0 2 6 4 2 5 2 2 3 0 8 2 5 3 3 4 4 6 8 5 0 3 5 2 6 1 9 3 1 1 8 8 1 7 1 0 1 0 0 0 3 1 3 7 8 3 8 7 5 2 8 8 6 5 8 7 5 3 3 2 0 8 3 8 1 4 2 0 6 1 7 1 7 7 6 6 9 1 4 7 3 0 3 5 9 8 2 5 3 4 9 0 4 2 8 7 5 5 4 6 8 7 3 1 1 5 9 5 6 2 8 6 3 8 8 2 3 5 3 7 8 7 5 9 3 7 5 1 9 5 7 7 8 1 8 5 7 7 8 0 5 3 2 1 7 1 2 2 6 8 0 6 6 1 3 0 0 1 9 2 7 8 7 6 6 1 1 1 9 5 9 0 9 2 1 6 4 2 0 1 9 8 A [T(290448019)] [T(1487478786)] [T(159903786)] using None Z [T(387083)] [T(1080738845)] [T(2147439074)] 0 using cmp Z [T(387083)] [T(1080738845)] [T(2147439074)] 0 using icmp Z [T(387083)] [T(1080738845)] [T(2147439074)] 259811 using None Z [T(387083)] [T(1080738845)] [T(2147439074)] 259811 using None Z [T(387083)] [T(1080738845)] [T(2147439074)] 0 [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] OK.

1 0

python/nondist/sandbox/parrotbench out5,1.2,1.3
by gvanrossum＠users.sourceforge.net Dec. 31, 2003

Dec. 31, 2003

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv20170 Modified Files: out5 Log Message: More fun with classes. Index: out5 =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out5,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** out5 31 Dec 2003 06:16:46 -0000 1.2 --- out5 31 Dec 2003 06:17:16 -0000 1.3 *************** *** 156,159 **** --- 156,160 ---- 42 == 42 getattr(<C object>, 'spam') raised IndexError + getattr(<C object>, 'spam', None) raised IndexError 'booh' == 'booh' None == None *************** *** 185,188 **** --- 186,190 ---- 42 == 42 getattr(<C object>, 'spam') raised IndexError + getattr(<C object>, 'spam', None) raised IndexError 'booh' == 'booh' None == None *************** *** 214,217 **** --- 216,224 ---- 42 == 42 getattr(<C object>, 'spam') raised IndexError + getattr(<C object>, 'spam', None) raised IndexError 'booh' == 'booh' + 42 == 42 + 42 == 42 + None == None + 42 == 42 OK.

1 0

python/nondist/sandbox/parrotbench b5.py, 1.1, 1.2 out5, 1.1, 1.2
by gvanrossum＠users.sourceforge.net Dec. 31, 2003

Dec. 31, 2003

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv20090 Modified Files: b5.py out5 Log Message: More fun with classes. Index: b5.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b5.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** b5.py 31 Dec 2003 05:39:55 -0000 1.1 --- b5.py 31 Dec 2003 06:16:46 -0000 1.2 *************** *** 14,21 **** f(*args) except exc: ! pass else: raise AssertionError("%s not raised by %s%r", ! exc.__name, f.__name__, args) def check_functions(): --- 14,23 ---- f(*args) except exc: ! if __debug__: ! if show: ! print "%s%r raised %s" % (f.__name__, args, exc.__name__) else: raise AssertionError("%s not raised by %s%r", ! exc.__name__, f.__name__, args) def check_functions(): *************** *** 160,163 **** --- 162,176 ---- check(type(object), type) check(type(lambda: None), type(check_functions)) + class C(object): + pass + class MC(type): + pass + class D: + __metaclass__ = MC + class E(object): + __metaclass__ = MC + check(type(C), type) + check(type(D), MC) + check(type(E), MC) check(unicode("abc"), u"abc") *************** *** 176,192 **** def check_descriptors(): ! class C(object): def getx(self): ! return self._x def setx(self, x): ! self._x = x def delx(self): ! del self._x x = property(getx, setx, delx) xx = property(getx) ! def f(*args): ! return list(args) fc = classmethod(f) fs = staticmethod(f) --- 189,238 ---- def check_descriptors(): ! class C0(object): ! ! def __getattribute__(self, name): ! if name == "spam": ! raise IndexError("no way") ! return super(C0, self).__getattribute__(name) ! ! class C(C0): ! ! hello = 42 ! ! def __new__(cls, *args): ! if args: ! return None ! return super(C, cls).__new__(cls) ! ! def __init__(self): ! self.__dict__["foo"] = 42 ! self.spam = 42 ! ! def __setattr__(self, name, value): ! if name == "foo": ! raise RuntimeError("forget it") ! super(C, self).__setattr__(name, value) ! ! def __getattr__(self, name): ! if name == "bar": ! return self.foo ! raise AttributeError(name) ! ! def __getattribute__(self, name): ! if name == "hello": ! return "booh" ! return super(C, self).__getattribute__(name) def getx(self): ! return self.__x def setx(self, x): ! self.__x = x def delx(self): ! del self.__x x = property(getx, setx, delx) xx = property(getx) ! def f(*args, **kwds): ! return list(args), dict(kwds) fc = classmethod(f) fs = staticmethod(f) *************** *** 199,220 **** return s ! c1 = C() ! exception(AttributeError, getattr, c1, "x") ! exception(AttributeError, getattr, c1, "xx") ! exception(AttributeError, setattr, c1, "xx", 42) ! setattr(c1, "x", 42) ! check(c1.x, 42) ! check(c1._x, 42) ! check(c1.xx, 42) ! exception(AttributeError, delattr, c1, "xx") ! del c1.x ! exception(AttributeError, getattr, c1, "x") ! exception(AttributeError, getattr, c1, "xx") ! exception(AttributeError, delattr, c1, "x") ! check(c1.f(42), [c1, 42]) ! check(c1.fc(42), [C, 42]) ! check(c1.fs(42), [42]) ! check(repr(c1), "<C object>") def main(): --- 245,312 ---- return s ! def checks(): ! check(C(1), None) ! c1 = C() ! exception(AttributeError, getattr, c1, 'booh') ! exception(AttributeError, getattr, c1, "x") ! exception(AttributeError, getattr, c1, "xx") ! exception(AttributeError, setattr, c1, "xx", 42) ! setattr(c1, "x", 42) ! check(c1.x, 42) ! check(c1._C__x, 42) ! check(c1.xx, 42) ! exception(AttributeError, delattr, c1, "xx") ! del c1.x ! exception(AttributeError, getattr, c1, "x") ! exception(AttributeError, getattr, c1, "xx") ! check(getattr(c1, "x", None), None) ! check(getattr(c1, "xx", None), None) ! exception(AttributeError, delattr, c1, "x") ! check(c1.f(42), ([c1, 42], {})) ! check(c1.fc(42, foo=42), ([C, 42], {"foo": 42})) ! check(c1.fs(42, a=1, b=2), ([42], {'a': 1, 'b': 2})) ! check(repr(c1), "<C object>") ! ! check(getattr(c1, 'foo'), 42) ! check(getattr(c1, 'bar'), 42) ! exception(RuntimeError, setattr, c1, "foo", 42) ! c1.bar = "hello" ! check(c1.bar, "hello") ! exception(IndexError, getattr, c1, "spam") ! check(getattr(c1, "hello"), "booh") ! B = C.__bases__[-1] ! save = B.__getattribute__ ! del B.__getattribute__ ! check(c1.spam, 42) ! check(getattr(c1, "hello"), "booh") ! save2 = C.__getattribute__ ! del C.__getattribute__ ! check(c1.hello, 42) ! C.__getattribute__ = save2 ! B.__getattribute__ = save ! exception(IndexError, getattr, c1, "spam") ! exception(IndexError, getattr, c1, "spam", None) ! check(getattr(c1, "hello"), "booh") ! ! checks() ! checks() ! class A(object): ! pass ! class B(object): ! def __getattribute__(self, name): ! if name == "spam": ! raise IndexError("no way") ! return super(B, self).__getattribute__(name) ! C.__bases__ = (A, B) ! checks() ! ! c2 = C() ! c2.x = 42 ! check(c2.x, 42) ! check(c2._C__x, 42) ! c2.__class__ = C0 ! check(getattr(c2, 'x', None), None) ! check(c2._C__x, 42) def main(): Index: out5 =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/out5,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** out5 31 Dec 2003 05:39:55 -0000 1.1 --- out5 31 Dec 2003 06:16:46 -0000 1.2 *************** *** 116,132 **** <type 'type'> == <type 'type'> <type 'function'> == <type 'function'> u'abc' == u'abc' u'abc' == u'abc' u'abc\xff' == u'abc\xff' u'abc\xff' == u'abc\xff' [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] == [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] [('a', 'd'), ('b', 'e'), ('c', 'f')] == [('a', 'd'), ('b', 'e'), ('c', 'f')] [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')] == [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')] 42 == 42 42 == 42 42 == 42 ! [<C object>, 42] == [<C object>, 42] ! [<class '__main__.C'>, 42] == [<class '__main__.C'>, 42] ! [42] == [42] '<C object>' == '<C object>' OK. --- 116,217 ---- <type 'type'> == <type 'type'> <type 'function'> == <type 'function'> + <type 'type'> == <type 'type'> + <class '__main__.MC'> == <class '__main__.MC'> + <class '__main__.MC'> == <class '__main__.MC'> u'abc' == u'abc' u'abc' == u'abc' u'abc\xff' == u'abc\xff' u'abc\xff' == u'abc\xff' + unicode('abc\xff', 'ascii') raised UnicodeError + unicode('abc\xff', 'utf-8') raised UnicodeError [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] == [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] [('a', 'd'), ('b', 'e'), ('c', 'f')] == [('a', 'd'), ('b', 'e'), ('c', 'f')] [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')] == [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')] + None == None + getattr(<C object>, 'booh') raised AttributeError + getattr(<C object>, 'x') raised AttributeError + getattr(<C object>, 'xx') raised AttributeError + setattr(<C object>, 'xx', 42) raised AttributeError 42 == 42 42 == 42 42 == 42 ! delattr(<C object>, 'xx') raised AttributeError ! getattr(<C object>, 'x') raised AttributeError ! getattr(<C object>, 'xx') raised AttributeError ! None == None ! None == None ! delattr(<C object>, 'x') raised AttributeError ! ([<C object>, 42], {}) == ([<C object>, 42], {}) ! ([<class '__main__.C'>, 42], {'foo': 42}) == ([<class '__main__.C'>, 42], {'foo': 42}) ! ([42], {'a': 1, 'b': 2}) == ([42], {'a': 1, 'b': 2}) '<C object>' == '<C object>' + 42 == 42 + 42 == 42 + setattr(<C object>, 'foo', 42) raised RuntimeError + 'hello' == 'hello' + getattr(<C object>, 'spam') raised IndexError + 'booh' == 'booh' + 42 == 42 + 'booh' == 'booh' + 42 == 42 + getattr(<C object>, 'spam') raised IndexError + 'booh' == 'booh' + None == None + getattr(<C object>, 'booh') raised AttributeError + getattr(<C object>, 'x') raised AttributeError + getattr(<C object>, 'xx') raised AttributeError + setattr(<C object>, 'xx', 42) raised AttributeError + 42 == 42 + 42 == 42 + 42 == 42 + delattr(<C object>, 'xx') raised AttributeError + getattr(<C object>, 'x') raised AttributeError + getattr(<C object>, 'xx') raised AttributeError + None == None + None == None + delattr(<C object>, 'x') raised AttributeError + ([<C object>, 42], {}) == ([<C object>, 42], {}) + ([<class '__main__.C'>, 42], {'foo': 42}) == ([<class '__main__.C'>, 42], {'foo': 42}) + ([42], {'a': 1, 'b': 2}) == ([42], {'a': 1, 'b': 2}) + '<C object>' == '<C object>' + 42 == 42 + 42 == 42 + setattr(<C object>, 'foo', 42) raised RuntimeError + 'hello' == 'hello' + getattr(<C object>, 'spam') raised IndexError + 'booh' == 'booh' + 42 == 42 + 'booh' == 'booh' + 42 == 42 + getattr(<C object>, 'spam') raised IndexError + 'booh' == 'booh' + None == None + getattr(<C object>, 'booh') raised AttributeError + getattr(<C object>, 'x') raised AttributeError + getattr(<C object>, 'xx') raised AttributeError + setattr(<C object>, 'xx', 42) raised AttributeError + 42 == 42 + 42 == 42 + 42 == 42 + delattr(<C object>, 'xx') raised AttributeError + getattr(<C object>, 'x') raised AttributeError + getattr(<C object>, 'xx') raised AttributeError + None == None + None == None + delattr(<C object>, 'x') raised AttributeError + ([<C object>, 42], {}) == ([<C object>, 42], {}) + ([<class '__main__.C'>, 42], {'foo': 42}) == ([<class '__main__.C'>, 42], {'foo': 42}) + ([42], {'a': 1, 'b': 2}) == ([42], {'a': 1, 'b': 2}) + '<C object>' == '<C object>' + 42 == 42 + 42 == 42 + setattr(<C object>, 'foo', 42) raised RuntimeError + 'hello' == 'hello' + getattr(<C object>, 'spam') raised IndexError + 'booh' == 'booh' + 42 == 42 + 'booh' == 'booh' + 42 == 42 + getattr(<C object>, 'spam') raised IndexError + 'booh' == 'booh' OK.

1 0

python/nondist/sandbox/parrotbench b5.py, NONE, 1.1 out5, NONE, 1.1 b.py, 1.3, 1.4
by gvanrossum＠users.sourceforge.net Dec. 31, 2003

Dec. 31, 2003

Update of /cvsroot/python/python/nondist/sandbox/parrotbench In directory sc8-pr-cvs1:/tmp/cvs-serv15475 Modified Files: b.py Added Files: b5.py out5 Log Message: Add rudimentary checks of builtins. --- NEW FILE: b5.py --- # Test existence and performance of builtins that aren't used elsewhere show = True def check(a, b): if __debug__: if show: print `a`, "==", `b` if not a == b: raise AssertionError("%.30r != %.30r" % (a, b)) def exception(exc, f, *args): try: f(*args) except exc: pass else: raise AssertionError("%s not raised by %s%r", exc.__name, f.__name__, args) def check_functions(): check(abs(42), 42) check(abs(-42), 42) check(abs(-12345678910), 12345678910) check(abs(-3.14), 3.14) check(abs(3j+4), 5) check(bool(1), True) check(bool(100), True) check(bool(0), False) check(bool([1,2,3]), True) check(bool([]), False) check(bool({1: 2}), True) check(bool({}), False) check(complex(3, 4), 3+4j) check(dict([(1,2), (3,4)]), {1: 2, 3: 4}) check(dict.fromkeys("abc"), {'a': None, 'b': None, 'c': None}) check(divmod(7, 4), (1, 3)) check(list(enumerate("abc")), [(0, 'a'), (1, 'b'), (2, 'c')]) check(filter(None, range(10)), range(1, 10)) check(filter(lambda x: x < 5, range(10)), range(5)) check(float("1.5"), 1.5) check(float(15), 15.0) check(float(10**100), 1e100) check(hash(42), hash(42L)) check(hash(42), hash(42.0)) check(hash(42+0j), hash(42.0)) check(hash("abc"), hash(u"abc")) check(hex(42).lower(), "0x2a") check(hex(42L).lower(), "0x2al") check(int("42"), 42) check(int("12345678910"), 12345678910) check(int("42", 0), 42) check(int("042", 0), 34) check(int("0x42", 0), 66) check(int("42", 8), 34) check(int("42", 16), 66) check(list((1, 2, 3)), [1, 2, 3]) check(list("abc"), ['a', 'b', 'c']) check(list(u"abc"), ['a', 'b', 'c']) check(long("42"), 42) check(long("12345678910"), 12345678910) check(long("42", 0), 42) check(long("042", 0), 34) check(long("0x42", 0), 66) check(long("42", 8), 34) check(long("42", 16), 66) check(map(None, range(5)), range(5)) check(map(None, range(5), range(5)), [(0, 0), (1, 1), (2, 2), (3, 3), (4, 4)]) check(map(lambda x: x+1, range(5)), range(1, 6)) check(map(len, ("", "a", "ab", "abc")), range(4)) check(min(1, 5), 1) check(min([3, 1, 2]), 1) check(min("Bac"), "B") check(min(u"aBc"), u"B") a = object() b = object() if id(a) == id(b): raise AssertionError("objects not unique") check(oct(42), '052') check(oct(42L), '052L') check(ord("a"), 97) check(ord(u"a"), 97) check(ord(u"\u1234"), 0x1234) check(pow(2, 10), 1024) check(pow(2, 100), 1L<<100) check(pow(2, 10, 100), 24) check(reduce(lambda a, b: a+b, ("a", "b", "c", "d", "e")), "abcde") check(repr(42), "42") check(repr(42L), "42L") check(repr(3.5), "3.5") check(repr(4.5j), "4.5j") check(repr(4j+3), "(3+4j)") check(repr(4j-3), "(-3+4j)") check(repr(-4j), "-4j") check(repr(3.5-0j), "(3.5+0j)") check(repr("abc"), "'abc'") check(repr("abc\012"), "'abc\\n'") check(repr(u"abc"), "u'abc'") check(repr(u"abc\u1234"), "u'abc\u1234'") check(repr(range(5)), "[0, 1, 2, 3, 4]") check(repr(('a', 'b', 'c')), "('a', 'b', 'c')") check(repr({1: 42}), "{1: 42}") for x in 42, 42L, 3.5, 4.5j, 4j+3, "abc", range(3), (1, 2, 'c'), {}: check(repr(x), `x`) check(str(42), "42") check(str(42L), "42") check(str(3.5), "3.5") check(str(4.5j), "4.5j") check(str(4j+3), "(3+4j)") check(str(4j-3), "(-3+4j)") check(str(-4j), "-4j") check(str(3.5-0j), "(3.5+0j)") check(str("abc"), "abc") check(str(range(5)), "[0, 1, 2, 3, 4]") check(str(('a', 'b', 'c')), "('a', 'b', 'c')") check(str({1: 42}), "{1: 42}") check(sum(range(1, 11)), 55) check(sum((3.5, 2, 4.5)), 10) check(tuple("abc"), ('a', 'b', 'c')) check(tuple(range(5)), (0, 1, 2, 3, 4)) check(tuple({1: 2}), (1,)) check(tuple(u"abc\u1234"), (u'a', u'b', u'c', u'\u1234')) check(type(1 == 1), bool) check(type(42), int) check(type(42L), long) check(type(3.14), float) check(type(0j), complex) check(type(''), str) check(type(u''), unicode) check(type(()), tuple) check(type(range(10)), list) check(type({}), dict) check(type(type), type) check(type(object), type) check(type(lambda: None), type(check_functions)) check(unicode("abc"), u"abc") check(unicode("abc", "ascii"), u"abc") check(unicode("abc\xff", "Latin-1"), u"abc\u00ff") check(unicode("abc\xc3\xbf", "utf8"), u"abc\xff") exception(UnicodeError, unicode, "abc\xff", "ascii") exception(UnicodeError, unicode, "abc\xff", "utf-8") check(list(xrange(10)), range(10)) check(zip("abc", "def"), [('a', 'd'), ('b', 'e'), ('c', 'f')]) check(zip("abc", "def", "ghi"), [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')]) def check_descriptors(): class C(object): def getx(self): return self._x def setx(self, x): self._x = x def delx(self): del self._x x = property(getx, setx, delx) xx = property(getx) def f(*args): return list(args) fc = classmethod(f) fs = staticmethod(f) def __repr__(self): s = super(C, self).__repr__() s = s.replace("<" + __name__ + ".", "<") i = s.index(" at ") s = s[:i] + ">" return s c1 = C() exception(AttributeError, getattr, c1, "x") exception(AttributeError, getattr, c1, "xx") exception(AttributeError, setattr, c1, "xx", 42) setattr(c1, "x", 42) check(c1.x, 42) check(c1._x, 42) check(c1.xx, 42) exception(AttributeError, delattr, c1, "xx") del c1.x exception(AttributeError, getattr, c1, "x") exception(AttributeError, getattr, c1, "xx") exception(AttributeError, delattr, c1, "x") check(c1.f(42), [c1, 42]) check(c1.fc(42), [C, 42]) check(c1.fs(42), [42]) check(repr(c1), "<C object>") def main(): global show show = True for i in range(500): check_functions() check_descriptors() show = False print "OK." if __name__ == '__main__': main() --- NEW FILE: out5 --- 42 == 42 42 == 42 12345678910L == 12345678910L 3.1400000000000001 == 3.1400000000000001 5.0 == 5 True == True True == True False == False True == True False == False True == True False == False (3+4j) == (3+4j) {1: 2, 3: 4} == {1: 2, 3: 4} {'a': None, 'c': None, 'b': None} == {'a': None, 'c': None, 'b': None} (1, 3) == (1, 3) [(0, 'a'), (1, 'b'), (2, 'c')] == [(0, 'a'), (1, 'b'), (2, 'c')] [1, 2, 3, 4, 5, 6, 7, 8, 9] == [1, 2, 3, 4, 5, 6, 7, 8, 9] [0, 1, 2, 3, 4] == [0, 1, 2, 3, 4] 1.5 == 1.5 15.0 == 15.0 1e+100 == 1e+100 42 == 42 42 == 42 42 == 42 -1600925533 == -1600925533 '0x2a' == '0x2a' '0x2al' == '0x2al' 42 == 42 12345678910L == 12345678910L 42 == 42 34 == 34 66 == 66 34 == 34 66 == 66 [1, 2, 3] == [1, 2, 3] ['a', 'b', 'c'] == ['a', 'b', 'c'] [u'a', u'b', u'c'] == ['a', 'b', 'c'] 42L == 42 12345678910L == 12345678910L 42L == 42 34L == 34 66L == 66 34L == 34 66L == 66 [0, 1, 2, 3, 4] == [0, 1, 2, 3, 4] [(0, 0), (1, 1), (2, 2), (3, 3), (4, 4)] == [(0, 0), (1, 1), (2, 2), (3, 3), (4, 4)] [1, 2, 3, 4, 5] == [1, 2, 3, 4, 5] [0, 1, 2, 3] == [0, 1, 2, 3] 1 == 1 1 == 1 'B' == 'B' u'B' == u'B' '052' == '052' '052L' == '052L' 97 == 97 97 == 97 4660 == 4660 1024 == 1024 1267650600228229401496703205376L == 1267650600228229401496703205376L 24 == 24 'abcde' == 'abcde' '42' == '42' '42L' == '42L' '3.5' == '3.5' '4.5j' == '4.5j' '(3+4j)' == '(3+4j)' '(-3+4j)' == '(-3+4j)' '-4j' == '-4j' '(3.5+0j)' == '(3.5+0j)' "'abc'" == "'abc'" "'abc\\n'" == "'abc\\n'" "u'abc'" == "u'abc'" "u'abc\\u1234'" == "u'abc\\u1234'" '[0, 1, 2, 3, 4]' == '[0, 1, 2, 3, 4]' "('a', 'b', 'c')" == "('a', 'b', 'c')" '{1: 42}' == '{1: 42}' '42' == '42' '42L' == '42L' '3.5' == '3.5' '4.5j' == '4.5j' '(3+4j)' == '(3+4j)' "'abc'" == "'abc'" '[0, 1, 2]' == '[0, 1, 2]' "(1, 2, 'c')" == "(1, 2, 'c')" '{}' == '{}' '42' == '42' '42' == '42' '3.5' == '3.5' '4.5j' == '4.5j' '(3+4j)' == '(3+4j)' '(-3+4j)' == '(-3+4j)' '-4j' == '-4j' '(3.5+0j)' == '(3.5+0j)' 'abc' == 'abc' '[0, 1, 2, 3, 4]' == '[0, 1, 2, 3, 4]' "('a', 'b', 'c')" == "('a', 'b', 'c')" '{1: 42}' == '{1: 42}' 55 == 55 10.0 == 10 ('a', 'b', 'c') == ('a', 'b', 'c') (0, 1, 2, 3, 4) == (0, 1, 2, 3, 4) (1,) == (1,) (u'a', u'b', u'c', u'\u1234') == (u'a', u'b', u'c', u'\u1234') <type 'bool'> == <type 'bool'> <type 'int'> == <type 'int'> <type 'long'> == <type 'long'> <type 'float'> == <type 'float'> <type 'complex'> == <type 'complex'> <type 'str'> == <type 'str'> <type 'unicode'> == <type 'unicode'> <type 'tuple'> == <type 'tuple'> <type 'list'> == <type 'list'> <type 'dict'> == <type 'dict'> <type 'type'> == <type 'type'> <type 'type'> == <type 'type'> <type 'function'> == <type 'function'> u'abc' == u'abc' u'abc' == u'abc' u'abc\xff' == u'abc\xff' u'abc\xff' == u'abc\xff' [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] == [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] [('a', 'd'), ('b', 'e'), ('c', 'f')] == [('a', 'd'), ('b', 'e'), ('c', 'f')] [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')] == [('a', 'd', 'g'), ('b', 'e', 'h'), ('c', 'f', 'i')] 42 == 42 42 == 42 42 == 42 [<C object>, 42] == [<C object>, 42] [<class '__main__.C'>, 42] == [<class '__main__.C'>, 42] [42] == [42] '<C object>' == '<C object>' OK. Index: b.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/parrotbench/b.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** b.py 31 Dec 2003 02:04:20 -0000 1.3 --- b.py 31 Dec 2003 05:39:55 -0000 1.4 *************** *** 4,5 **** --- 4,6 ---- import b3 import b4 + import b5; b5.main()

1 0

python/dist/src/Doc/lib libshlex.tex,1.17,1.18
by fdrake＠users.sourceforge.net Dec. 31, 2003

Dec. 31, 2003

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv11976 Modified Files: libshlex.tex Log Message: - general markup cleanup - rearrange so two small sections become one; this avoids an extra page in the HTML format Index: libshlex.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libshlex.tex,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** libshlex.tex 8 Sep 2003 18:52:18 -0000 1.17 --- libshlex.tex 31 Dec 2003 05:18:46 -0000 1.18 *************** *** 13,42 **** The \class{shlex} class makes it easy to write lexical analyzers for simple syntaxes resembling that of the \UNIX{} shell. This will often ! be useful for writing minilanguages, (e.g. in run control files for ! Python applications) or for parsing quoted strings. ! ! \begin{seealso} ! \seemodule{ConfigParser}{Parser for configuration files similar to the ! Windows \file{.ini} files.} ! \end{seealso} ! ! ! \subsection{Module Contents} The \module{shlex} module defines the following functions: ! \begin{funcdesc}{split}{s\optional{, comments=\code{False}}} Split the string \var{s} using shell-like syntax. If \var{comments} is ! \code{False}, the parsing of comments in the given string will be ! disabled (setting the \member{commenters} member of the \class{shlex} ! instance to the empty string). This function operates in \POSIX{} mode. \versionadded{2.3} \end{funcdesc} ! The \module{shlex} module defines the following classes: ! \begin{classdesc}{shlex}{\optional{instream=\code{sys.stdin}\optional{, ! infile=\code{None}\optional{, ! posix=\code{False}}}}} A \class{shlex} instance or subclass instance is a lexical analyzer object. The initialization argument, if present, specifies where to --- 13,34 ---- The \class{shlex} class makes it easy to write lexical analyzers for simple syntaxes resembling that of the \UNIX{} shell. This will often ! be useful for writing minilanguages, (for example, in run control ! files for Python applications) or for parsing quoted strings. The \module{shlex} module defines the following functions: ! \begin{funcdesc}{split}{s\optional{, comments}} Split the string \var{s} using shell-like syntax. If \var{comments} is ! \constant{False} (the default), the parsing of comments in the given ! string will be disabled (setting the \member{commenters} member of the ! \class{shlex} instance to the empty string). This function operates ! in \POSIX{} mode. \versionadded{2.3} \end{funcdesc} ! The \module{shlex} module defines the following class: ! \begin{classdesc}{shlex}{\optional{instream\optional{, ! infile\optional{, posix}}}} A \class{shlex} instance or subclass instance is a lexical analyzer object. The initialization argument, if present, specifies where to *************** *** 52,58 **** operate in compatibility mode. When operating in \POSIX{} mode, \class{shlex} will try to be as close as possible to the \POSIX{} shell ! parsing rules. See~\ref{shlex-objects}. \end{classdesc} \subsection{shlex Objects \label{shlex-objects}} --- 44,56 ---- operate in compatibility mode. When operating in \POSIX{} mode, \class{shlex} will try to be as close as possible to the \POSIX{} shell ! parsing rules. See section~\ref{shlex-objects}. \end{classdesc} + \begin{seealso} + \seemodule{ConfigParser}{Parser for configuration files similar to the + Windows \file{.ini} files.} + \end{seealso} + + \subsection{shlex Objects \label{shlex-objects}} *************** *** 86,90 **** the result is an absolute pathname, or there was no previous source request in effect, or the previous source was a stream ! (e.g. \code{sys.stdin}), the result is left alone. Otherwise, if the result is a relative pathname, the directory part of the name of the file immediately before it on the source inclusion stack is prepended --- 84,88 ---- the result is an absolute pathname, or there was no previous source request in effect, or the previous source was a stream ! (such as \code{sys.stdin}), the result is left alone. Otherwise, if the result is a relative pathname, the directory part of the name of the file immediately before it on the source inclusion stack is prepended *************** *** 269,273 **** or the escape character itself. Otherwise the escape character will be considered a normal character. ! \item EOF is signaled with a \code{None} value; \item Quoted empty strings (\code{''}) are allowed; \end{itemize} --- 267,271 ---- or the escape character itself. Otherwise the escape character will be considered a normal character. ! \item EOF is signaled with a \constant{None} value; \item Quoted empty strings (\code{''}) are allowed; \end{itemize}

1 0

python/dist/src/Doc/lib libcmd.tex,1.14,1.15
by fdrake＠users.sourceforge.net Dec. 31, 2003

Dec. 31, 2003

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv9486 Modified Files: libcmd.tex Log Message: general markup improvements Index: libcmd.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcmd.tex,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** libcmd.tex 6 Feb 2003 05:02:39 -0000 1.14 --- libcmd.tex 31 Dec 2003 05:01:23 -0000 1.15 *************** *** 12,16 **** later be wrapped in a more sophisticated interface. ! \begin{classdesc}{Cmd}{\optional{completekey},\optional{stdin},\optional{stdout}} A \class{Cmd} instance or subclass instance is a line-oriented interpreter framework. There is no good reason to instantiate --- 12,17 ---- later be wrapped in a more sophisticated interface. ! \begin{classdesc}{Cmd}{\optional{completekey\optional{, ! stdin\optional{, stdout}}}} A \class{Cmd} instance or subclass instance is a line-oriented interpreter framework. There is no good reason to instantiate *************** *** 21,25 **** The optional argument \var{completekey} is the \refmodule{readline} name of a completion key; it defaults to \kbd{Tab}. If \var{completekey} is ! not \code{None} and \module{readline} is available, command completion is done automatically. --- 22,26 ---- The optional argument \var{completekey} is the \refmodule{readline} name of a completion key; it defaults to \kbd{Tab}. If \var{completekey} is ! not \constant{None} and \refmodule{readline} is available, command completion is done automatically. *************** *** 45,49 **** first prompt (this overrides the \member{intro} class member). ! If the \module{readline} module is loaded, input will automatically inherit \program{bash}-like history-list editing (e.g. \kbd{Control-P} scrolls back to the last command, \kbd{Control-N} forward to the next --- 46,50 ---- first prompt (this overrides the \member{intro} class member). ! If the \refmodule{readline} module is loaded, input will automatically inherit \program{bash}-like history-list editing (e.g. \kbd{Control-P} scrolls back to the last command, \kbd{Control-N} forward to the next *************** *** 185,190 **** if false, \method{sys.stdout.write()} and \method{sys.stdin.readline()} are used. (This means that by ! importing \module{readline}, on systems that support it, the ! interpreter will automatically support Emacs-like line editing and command-history keystrokes.) \end{memberdesc} --- 186,191 ---- if false, \method{sys.stdout.write()} and \method{sys.stdin.readline()} are used. (This means that by ! importing \refmodule{readline}, on systems that support it, the ! interpreter will automatically support \program{Emacs}-like line editing and command-history keystrokes.) \end{memberdesc}

1 0

python/dist/src/Doc/lib libtime.tex,1.61,1.62
by fdrake＠users.sourceforge.net Dec. 30, 2003

Dec. 30, 2003

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv8190 Modified Files: libtime.tex Log Message: - add link to the datetime module Index: libtime.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libtime.tex,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** libtime.tex 8 Sep 2003 18:52:18 -0000 1.61 --- libtime.tex 31 Dec 2003 04:52:36 -0000 1.62 *************** *** 427,430 **** --- 427,431 ---- \begin{seealso} + \seemodule{datetime}{More object-oriented interface to dates and times.} \seemodule{locale}{Internationalization services. The locale settings can affect the return values for some of

1 0

python/dist/src/Doc/lib libcalendar.tex, 1.17, 1.18
by fdrake＠users.sourceforge.net Dec. 30, 2003

Dec. 30, 2003

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv8092 Modified Files: libcalendar.tex Log Message: - update description of isleap() - add link to the datetime module Index: libcalendar.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcalendar.tex,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** libcalendar.tex 25 Dec 2002 16:37:19 -0000 1.17 --- libcalendar.tex 31 Dec 2003 04:51:56 -0000 1.18 *************** *** 43,47 **** \begin{funcdesc}{isleap}{year} ! Returns \code{1} if \var{year} is a leap year, otherwise \code{0}. \end{funcdesc} --- 43,48 ---- \begin{funcdesc}{isleap}{year} ! Returns \constant{True} if \var{year} is a leap year, otherwise ! \constant{False}. \end{funcdesc} *************** *** 109,112 **** --- 110,116 ---- \begin{seealso} + \seemodule{datetime}{Object-oriented interface to dates and times + with similar functionality to the + \refmodule{time} module.} \seemodule{time}{Low-level time related functions.} \end{seealso}

1 0