mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
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:
parent
9ada3d6e29
commit
49fd7fa443
640 changed files with 52240 additions and 18408 deletions
|
@ -29,7 +29,7 @@
|
|||
# into a program for a different change to Python programs...
|
||||
|
||||
import sys
|
||||
import regex
|
||||
import re
|
||||
import os
|
||||
from stat import *
|
||||
import string
|
||||
|
@ -53,7 +53,7 @@ def main():
|
|||
if fix(arg): bad = 1
|
||||
sys.exit(bad)
|
||||
|
||||
ispythonprog = regex.compile('^[a-zA-Z0-9_]+\.py$')
|
||||
ispythonprog = re.compile('^[a-zA-Z0-9_]+\.py$')
|
||||
def ispython(name):
|
||||
return ispythonprog.match(name) >= 0
|
||||
|
||||
|
@ -104,7 +104,7 @@ def fix(filename):
|
|||
if lineno == 1 and g is None and line[:2] == '#!':
|
||||
# Check for non-Python scripts
|
||||
words = string.split(line[2:])
|
||||
if words and regex.search('[pP]ython', words[0]) < 0:
|
||||
if words and re.search('[pP]ython', words[0]) < 0:
|
||||
msg = filename + ': ' + words[0]
|
||||
msg = msg + ' script; not fixed\n'
|
||||
err(msg)
|
||||
|
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
import os
|
||||
import sys
|
||||
import regex
|
||||
import re
|
||||
import string
|
||||
import getopt
|
||||
|
||||
pat = '^\([a-zA-Z0-9 :]*\)!\(.*\)!\(.*\)!\([<>].*\)!\([0-9]+\)!\([0-9]+\)$'
|
||||
prog = regex.compile(pat)
|
||||
pat = '^([a-zA-Z0-9 :]*)!(.*)!(.*)!([<>].*)!([0-9]+)!([0-9]+)$'
|
||||
prog = re.compile(pat)
|
||||
|
||||
def main():
|
||||
maxitems = 25
|
||||
|
|
|
@ -10,7 +10,7 @@ import time
|
|||
import os
|
||||
import stat
|
||||
import getopt
|
||||
import regex
|
||||
import re
|
||||
|
||||
def main():
|
||||
dofile = mmdf
|
||||
|
@ -45,7 +45,7 @@ def main():
|
|||
if sts:
|
||||
sys.exit(sts)
|
||||
|
||||
numeric = regex.compile('[1-9][0-9]*')
|
||||
numeric = re.compile('[1-9][0-9]*')
|
||||
|
||||
def mh(dir):
|
||||
sts = 0
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
|
||||
import os
|
||||
import sys
|
||||
import regex
|
||||
import re
|
||||
|
||||
pat = '^\([^: \t\n]+\):\([1-9][0-9]*\):'
|
||||
prog = regex.compile(pat)
|
||||
pat = '^([^: \t\n]+):([1-9][0-9]*):'
|
||||
prog = re.compile(pat)
|
||||
|
||||
class FileObj:
|
||||
def __init__(self, filename):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue