mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

Browse source 
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html

Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:

test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec

This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
This commit is contained in:
Thomas Wouters 2006-04-21 10:40:58 +00:00
parent 9ada3d6e29
commit 49fd7fa443
640 changed files with 52240 additions and 18408 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Lib/test/test_sundry.py
View file

@ -12,75 +12,50 @@ warnings.filterwarnings("ignore",
from test.test_support import verbose
import BaseHTTPServer
import DocXMLRPCServer
import CGIHTTPServer
import Queue
import SimpleHTTPServer
import SocketServer
import SimpleXMLRPCServer
import aifc
import anydbm
import audiodev
import bdb
import cgitb
import cmd
import code
import codeop
import colorsys
import commands
import compileall
try:
import curses # not available on Windows
except ImportError:
if verbose:
print "skipping curses"
import dircache
import dis
import distutils
import doctest
import dumbdbm
import encodings
import fnmatch
import formatter
import fpformat
import ftplib
import getpass
import glob
import gopherlib
import htmlentitydefs
import htmllib
import httplib
import imaplib
import ihooks
import imghdr
import imputil
import keyword
import macpath
import linecache
import macurl2path
import mailcap
import mhlib
import mimetypes
import mimify
import multifile
import mutex
import nntplib
import nturl2path
import opcode
import os2emxpath
import pdb
import pipes
#import poplib
import posixfile
import profile
import pstats
import py_compile
#import reconvert
import repr
import pydoc
import rexec
try:
import rlcompleter # not available on Windows
except ImportError:
if verbose:
print "skipping rlcompleter"
import robotparser
import sched
import sgmllib
import shelve
import shlex
import shutil
import smtplib
import sndhdr
import statvfs
@ -90,12 +65,17 @@ import sunaudio
import symbol
import tabnanny
import telnetlib
import test
import timeit
import toaiff
import urllib2
import token
try:
import tty # not available on Windows
except ImportError:
if verbose:
print "skipping tty"
# Can't test the "user" module -- if the user has a ~/.pythonrc.py, it
# can screw up all sorts of things (esp. if it prints!).
#import user
import webbrowser
import whichdb
import xml