2010-03-12 06:53:45 +08:00
|
|
|
|
#! /usr/bin/env python3
|
2001-08-14 05:18:01 +08:00
|
|
|
|
"""An RFC 2821 smtp proxy.
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
Usage: %(program)s [options] [localhost:localport [remotehost:remoteport]]
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
Options:
|
|
|
|
|
|
|
|
|
|
--nosetuid
|
|
|
|
|
-n
|
|
|
|
|
This program generally tries to setuid `nobody', unless this flag is
|
|
|
|
|
set. The setuid call will fail if this program is not run as root (in
|
|
|
|
|
which case, use this flag).
|
|
|
|
|
|
|
|
|
|
--version
|
|
|
|
|
-V
|
|
|
|
|
Print the version number and exit.
|
|
|
|
|
|
|
|
|
|
--class classname
|
|
|
|
|
-c classname
|
2004-10-10 05:44:13 +08:00
|
|
|
|
Use `classname' as the concrete SMTP proxy class. Uses `PureProxy' by
|
2001-02-01 06:51:35 +08:00
|
|
|
|
default.
|
|
|
|
|
|
|
|
|
|
--debug
|
|
|
|
|
-d
|
|
|
|
|
Turn on debugging prints.
|
|
|
|
|
|
|
|
|
|
--help
|
|
|
|
|
-h
|
|
|
|
|
Print this message and exit.
|
|
|
|
|
|
|
|
|
|
Version: %(__version__)s
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
If localhost is not given then `localhost' is used, and if localport is not
|
|
|
|
|
given then 8025 is used. If remotehost is not given then `localhost' is used,
|
|
|
|
|
and if remoteport is not given, then 25 is used.
|
2001-02-01 06:51:35 +08:00
|
|
|
|
"""
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
# Overview:
|
|
|
|
|
#
|
|
|
|
|
# This file implements the minimal SMTP protocol as defined in RFC 821. It
|
|
|
|
|
# has a hierarchy of classes which implement the backend functionality for the
|
|
|
|
|
# smtpd. A number of classes are provided:
|
|
|
|
|
#
|
2001-04-15 21:06:04 +08:00
|
|
|
|
# SMTPServer - the base class for the backend. Raises NotImplementedError
|
2001-02-01 06:51:35 +08:00
|
|
|
|
# if you try to use it.
|
|
|
|
|
#
|
|
|
|
|
# DebuggingServer - simply prints each message it receives on stdout.
|
|
|
|
|
#
|
|
|
|
|
# PureProxy - Proxies all messages to a real smtpd which does final
|
|
|
|
|
# delivery. One known problem with this class is that it doesn't handle
|
|
|
|
|
# SMTP errors from the backend server at all. This should be fixed
|
|
|
|
|
# (contributions are welcome!).
|
|
|
|
|
#
|
|
|
|
|
# MailmanProxy - An experimental hack to work with GNU Mailman
|
|
|
|
|
# <www.list.org>. Using this server as your real incoming smtpd, your
|
|
|
|
|
# mailhost will automatically recognize and accept mail destined to Mailman
|
|
|
|
|
# lists when those lists are created. Every message not destined for a list
|
|
|
|
|
# gets forwarded to a real backend smtpd, as with PureProxy. Again, errors
|
|
|
|
|
# are not handled correctly yet.
|
|
|
|
|
#
|
|
|
|
|
#
|
2004-07-13 07:10:08 +08:00
|
|
|
|
# Author: Barry Warsaw <barry@python.org>
|
2001-02-01 06:51:35 +08:00
|
|
|
|
#
|
|
|
|
|
# TODO:
|
|
|
|
|
#
|
|
|
|
|
# - support mailbox delivery
|
|
|
|
|
# - alias files
|
|
|
|
|
# - ESMTP
|
|
|
|
|
# - handle error codes from the backend smtpd
|
|
|
|
|
|
|
|
|
|
import sys
|
|
|
|
|
import os
|
|
|
|
|
import errno
|
|
|
|
|
import getopt
|
|
|
|
|
import time
|
|
|
|
|
import socket
|
|
|
|
|
import asyncore
|
|
|
|
|
import asynchat
|
2010-07-24 17:51:40 +08:00
|
|
|
|
from warnings import warn
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
2001-02-16 06:15:14 +08:00
|
|
|
|
__all__ = ["SMTPServer","DebuggingServer","PureProxy","MailmanProxy"]
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
program = sys.argv[0]
|
|
|
|
|
__version__ = 'Python SMTP proxy version 0.2'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class Devnull:
|
|
|
|
|
def write(self, msg): pass
|
|
|
|
|
def flush(self): pass
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DEBUGSTREAM = Devnull()
|
|
|
|
|
NEWLINE = '\n'
|
|
|
|
|
EMPTYSTRING = ''
|
2001-10-05 00:27:04 +08:00
|
|
|
|
COMMASPACE = ', '
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
def usage(code, msg=''):
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print(__doc__ % globals(), file=sys.stderr)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
if msg:
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print(msg, file=sys.stderr)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
sys.exit(code)
|
|
|
|
|
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
class SMTPChannel(asynchat.async_chat):
|
|
|
|
|
COMMAND = 0
|
|
|
|
|
DATA = 1
|
|
|
|
|
|
2010-12-03 15:38:22 +08:00
|
|
|
|
data_size_limit = 33554432
|
|
|
|
|
command_size_limit = 512
|
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
def __init__(self, server, conn, addr):
|
|
|
|
|
asynchat.async_chat.__init__(self, conn)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.smtp_server = server
|
|
|
|
|
self.conn = conn
|
|
|
|
|
self.addr = addr
|
|
|
|
|
self.received_lines = []
|
|
|
|
|
self.smtp_state = self.COMMAND
|
|
|
|
|
self.seen_greeting = ''
|
|
|
|
|
self.mailfrom = None
|
|
|
|
|
self.rcpttos = []
|
|
|
|
|
self.received_data = ''
|
|
|
|
|
self.fqdn = socket.getfqdn()
|
2010-12-03 15:38:22 +08:00
|
|
|
|
self.num_bytes = 0
|
2010-08-24 06:28:13 +08:00
|
|
|
|
try:
|
|
|
|
|
self.peer = conn.getpeername()
|
|
|
|
|
except socket.error as err:
|
|
|
|
|
# a race condition may occur if the other end is closing
|
|
|
|
|
# before we can get the peername
|
|
|
|
|
self.close()
|
|
|
|
|
if err.args[0] != errno.ENOTCONN:
|
|
|
|
|
raise
|
|
|
|
|
return
|
2010-07-24 17:51:40 +08:00
|
|
|
|
print('Peer:', repr(self.peer), file=DEBUGSTREAM)
|
|
|
|
|
self.push('220 %s %s' % (self.fqdn, __version__))
|
2008-07-07 12:15:08 +08:00
|
|
|
|
self.set_terminator(b'\r\n')
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
2010-07-24 17:51:40 +08:00
|
|
|
|
# properties for backwards-compatibility
|
|
|
|
|
@property
|
|
|
|
|
def __server(self):
|
|
|
|
|
warn("Access to __server attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'smtp_server' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.smtp_server
|
|
|
|
|
@__server.setter
|
|
|
|
|
def __server(self, value):
|
|
|
|
|
warn("Setting __server attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'smtp_server' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.smtp_server = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __line(self):
|
|
|
|
|
warn("Access to __line attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'received_lines' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.received_lines
|
|
|
|
|
@__line.setter
|
|
|
|
|
def __line(self, value):
|
|
|
|
|
warn("Setting __line attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'received_lines' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.received_lines = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __state(self):
|
|
|
|
|
warn("Access to __state attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'smtp_state' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.smtp_state
|
|
|
|
|
@__state.setter
|
|
|
|
|
def __state(self, value):
|
|
|
|
|
warn("Setting __state attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'smtp_state' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.smtp_state = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __greeting(self):
|
|
|
|
|
warn("Access to __greeting attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'seen_greeting' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.seen_greeting
|
|
|
|
|
@__greeting.setter
|
|
|
|
|
def __greeting(self, value):
|
|
|
|
|
warn("Setting __greeting attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'seen_greeting' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.seen_greeting = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __mailfrom(self):
|
|
|
|
|
warn("Access to __mailfrom attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'mailfrom' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.mailfrom
|
|
|
|
|
@__mailfrom.setter
|
|
|
|
|
def __mailfrom(self, value):
|
|
|
|
|
warn("Setting __mailfrom attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'mailfrom' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.mailfrom = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __rcpttos(self):
|
|
|
|
|
warn("Access to __rcpttos attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'rcpttos' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.rcpttos
|
|
|
|
|
@__rcpttos.setter
|
|
|
|
|
def __rcpttos(self, value):
|
|
|
|
|
warn("Setting __rcpttos attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'rcpttos' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.rcpttos = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __data(self):
|
|
|
|
|
warn("Access to __data attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'received_data' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.received_data
|
|
|
|
|
@__data.setter
|
|
|
|
|
def __data(self, value):
|
|
|
|
|
warn("Setting __data attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'received_data' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.received_data = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __fqdn(self):
|
|
|
|
|
warn("Access to __fqdn attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'fqdn' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.fqdn
|
|
|
|
|
@__fqdn.setter
|
|
|
|
|
def __fqdn(self, value):
|
|
|
|
|
warn("Setting __fqdn attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'fqdn' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.fqdn = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __peer(self):
|
|
|
|
|
warn("Access to __peer attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'peer' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.peer
|
|
|
|
|
@__peer.setter
|
|
|
|
|
def __peer(self, value):
|
|
|
|
|
warn("Setting __peer attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'peer' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.peer = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __conn(self):
|
|
|
|
|
warn("Access to __conn attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'conn' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.conn
|
|
|
|
|
@__conn.setter
|
|
|
|
|
def __conn(self, value):
|
|
|
|
|
warn("Setting __conn attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'conn' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.conn = value
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def __addr(self):
|
|
|
|
|
warn("Access to __addr attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"use 'addr' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
return self.addr
|
|
|
|
|
@__addr.setter
|
|
|
|
|
def __addr(self, value):
|
|
|
|
|
warn("Setting __addr attribute on SMTPChannel is deprecated, "
|
2011-12-10 18:07:42 +08:00
|
|
|
|
"set 'addr' instead", DeprecationWarning, 2)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.addr = value
|
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
# Overrides base class for convenience
|
|
|
|
|
def push(self, msg):
|
2008-07-07 12:15:08 +08:00
|
|
|
|
asynchat.async_chat.push(self, bytes(msg + '\r\n', 'ascii'))
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
# Implementation of base class abstract method
|
|
|
|
|
def collect_incoming_data(self, data):
|
2010-12-03 15:38:22 +08:00
|
|
|
|
limit = None
|
|
|
|
|
if self.smtp_state == self.COMMAND:
|
|
|
|
|
limit = self.command_size_limit
|
|
|
|
|
elif self.smtp_state == self.DATA:
|
|
|
|
|
limit = self.data_size_limit
|
|
|
|
|
if limit and self.num_bytes > limit:
|
|
|
|
|
return
|
|
|
|
|
elif limit:
|
|
|
|
|
self.num_bytes += len(data)
|
2011-02-25 23:42:01 +08:00
|
|
|
|
self.received_lines.append(str(data, "utf-8"))
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
# Implementation of base class abstract method
|
|
|
|
|
def found_terminator(self):
|
2010-07-24 17:51:40 +08:00
|
|
|
|
line = EMPTYSTRING.join(self.received_lines)
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('Data:', repr(line), file=DEBUGSTREAM)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.received_lines = []
|
|
|
|
|
if self.smtp_state == self.COMMAND:
|
2010-12-03 15:38:22 +08:00
|
|
|
|
if self.num_bytes > self.command_size_limit:
|
|
|
|
|
self.push('500 Error: line too long')
|
|
|
|
|
self.num_bytes = 0
|
|
|
|
|
return
|
|
|
|
|
self.num_bytes = 0
|
2001-02-01 06:51:35 +08:00
|
|
|
|
if not line:
|
|
|
|
|
self.push('500 Error: bad syntax')
|
|
|
|
|
return
|
|
|
|
|
method = None
|
|
|
|
|
i = line.find(' ')
|
|
|
|
|
if i < 0:
|
|
|
|
|
command = line.upper()
|
|
|
|
|
arg = None
|
|
|
|
|
else:
|
|
|
|
|
command = line[:i].upper()
|
|
|
|
|
arg = line[i+1:].strip()
|
|
|
|
|
method = getattr(self, 'smtp_' + command, None)
|
|
|
|
|
if not method:
|
|
|
|
|
self.push('502 Error: command "%s" not implemented' % command)
|
|
|
|
|
return
|
|
|
|
|
method(arg)
|
|
|
|
|
return
|
|
|
|
|
else:
|
2010-07-24 17:51:40 +08:00
|
|
|
|
if self.smtp_state != self.DATA:
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('451 Internal confusion')
|
2010-12-03 15:38:22 +08:00
|
|
|
|
self.num_bytes = 0
|
|
|
|
|
return
|
|
|
|
|
if self.num_bytes > self.data_size_limit:
|
|
|
|
|
self.push('552 Error: Too much mail data')
|
|
|
|
|
self.num_bytes = 0
|
2001-02-01 06:51:35 +08:00
|
|
|
|
return
|
|
|
|
|
# Remove extraneous carriage returns and de-transparency according
|
|
|
|
|
# to RFC 821, Section 4.5.2.
|
|
|
|
|
data = []
|
|
|
|
|
for text in line.split('\r\n'):
|
|
|
|
|
if text and text[0] == '.':
|
|
|
|
|
data.append(text[1:])
|
|
|
|
|
else:
|
|
|
|
|
data.append(text)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.received_data = NEWLINE.join(data)
|
2010-07-31 18:08:09 +08:00
|
|
|
|
status = self.smtp_server.process_message(self.peer,
|
|
|
|
|
self.mailfrom,
|
|
|
|
|
self.rcpttos,
|
|
|
|
|
self.received_data)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.rcpttos = []
|
|
|
|
|
self.mailfrom = None
|
|
|
|
|
self.smtp_state = self.COMMAND
|
2010-12-03 15:38:22 +08:00
|
|
|
|
self.num_bytes = 0
|
2008-07-07 12:15:08 +08:00
|
|
|
|
self.set_terminator(b'\r\n')
|
2001-02-01 06:51:35 +08:00
|
|
|
|
if not status:
|
|
|
|
|
self.push('250 Ok')
|
|
|
|
|
else:
|
|
|
|
|
self.push(status)
|
|
|
|
|
|
|
|
|
|
# SMTP and ESMTP commands
|
|
|
|
|
def smtp_HELO(self, arg):
|
|
|
|
|
if not arg:
|
|
|
|
|
self.push('501 Syntax: HELO hostname')
|
|
|
|
|
return
|
2010-07-24 17:51:40 +08:00
|
|
|
|
if self.seen_greeting:
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('503 Duplicate HELO/EHLO')
|
|
|
|
|
else:
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.seen_greeting = arg
|
|
|
|
|
self.push('250 %s' % self.fqdn)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
def smtp_NOOP(self, arg):
|
|
|
|
|
if arg:
|
|
|
|
|
self.push('501 Syntax: NOOP')
|
|
|
|
|
else:
|
|
|
|
|
self.push('250 Ok')
|
|
|
|
|
|
|
|
|
|
def smtp_QUIT(self, arg):
|
|
|
|
|
# args is ignored
|
|
|
|
|
self.push('221 Bye')
|
|
|
|
|
self.close_when_done()
|
|
|
|
|
|
|
|
|
|
# factored
|
|
|
|
|
def __getaddr(self, keyword, arg):
|
|
|
|
|
address = None
|
|
|
|
|
keylen = len(keyword)
|
|
|
|
|
if arg[:keylen].upper() == keyword:
|
|
|
|
|
address = arg[keylen:].strip()
|
2001-11-04 11:04:25 +08:00
|
|
|
|
if not address:
|
|
|
|
|
pass
|
|
|
|
|
elif address[0] == '<' and address[-1] == '>' and address != '<>':
|
2001-02-01 06:51:35 +08:00
|
|
|
|
# Addresses can be in the form <person@dom.com> but watch out
|
|
|
|
|
# for null address, e.g. <>
|
|
|
|
|
address = address[1:-1]
|
|
|
|
|
return address
|
|
|
|
|
|
|
|
|
|
def smtp_MAIL(self, arg):
|
2012-03-21 04:16:29 +08:00
|
|
|
|
if not self.seen_greeting:
|
|
|
|
|
self.push('503 Error: send HELO first');
|
|
|
|
|
return
|
|
|
|
|
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('===> MAIL', arg, file=DEBUGSTREAM)
|
Merged revisions 58221-58741 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines
Patch #1181: add os.environ.clear() method.
........
r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines
Issue1704287: "make install" fails unless you do "make" first. Make
oldsharedmods and sharedmods in "libinstall".
........
r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines
Patch # 188 by Philip Jenvey.
Make tell() mark CRLF as a newline.
With unit test.
........
r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines
Fix typo and double word.
........
r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines
#1196: document default radix for int().
........
r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines
#1177: accept 2xx responses for https too, not only http.
........
r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line
Remove stray odd character; grammar fix
........
r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line
Typo fix
........
r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line
Add various items
........
r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line
Change to flush and close logic to fix #1760556.
........
r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line
Change to basicConfig() to fix #1021.
........
r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines
#1208: document match object's boolean value.
........
r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line
Minor date change.
........
r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line
Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time.
........
r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines
tuple.__repr__ did not consider a reference loop as it is not possible from
Python code; but it is possible from C. object.__str__ had the issue of not
expecting a type to doing something within it's tp_str implementation that
could trigger an infinite recursion, but it could in C code.. Both found
thanks to BaseException and how it handles its repr.
Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at
coming up with a solution.
........
r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines
Fix error introduced by r58288; if a tuple is length 0 return its repr and
don't worry about any self-referring tuples.
........
r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines
Made the various is_* operations return booleans. This was discussed
with Cawlishaw by mail, and he basically confirmed that to these is_*
operations, there's no need to return Decimal(0) and Decimal(1) if
the language supports the False and True booleans.
Also added a few tests for the these functions in extra.decTest, since
they are mostly untested (apart from the doctests).
Thanks Mark Dickinson
........
r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines
Added a class to store the digits of log(10), so that they can be made
available when necessary without recomputing. Thanks Mark Dickinson
........
r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines
Added note in footnote about string comparisons about
unicodedata.normalize().
........
r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line
enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy.
........
r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line
itertools.count() no longer limited to sys.maxint.
........
r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines
Assume that the user knows when he wants to end the line; don't insert
something he didn't select or complete.
........
r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines
Remove unused theme that was causing a fault in p3k.
........
r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines
Clean up EditorWindow close.
........
r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines
textView cleanup. Patch 1718043 Tal Einat.
M idlelib/EditorWindow.py
M idlelib/aboutDialog.py
M idlelib/textView.py
M idlelib/NEWS.txt
........
r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines
configDialog cleanup. Patch 1730217 Tal Einat.
........
r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines
Coverity #151: Remove deadcode.
All this code already exists above starting at line 653.
........
r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line
wrap lines to <80 characters before fixing errors
........
r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines
Add __asdict__() to NamedTuple and refine the docs.
Add maxlen support to deque() and fixup docs.
Partially fix __reduce__(). The None as a third arg was no longer supported.
Still needs work on __reduce__() to handle recursive inputs.
........
r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines
move descriptions of ac_(in|out)_buffer_size to the right place
http://bugs.python.org/issue1053
........
r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines
dict could be NULL, so we need to XDECREF.
Fix a compiler warning about passing a PyTypeObject* instead of PyObject*.
........
r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines
Fix Coverity #158: Check the correct variable.
........
r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines
Fix Coverity #159.
This code was broken if save() returned a negative number since i contained
a boolean value and then we compared i < 0 which should never be true.
Will backport (assuming it's necessary)
........
r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line
Add a note about fixing some more warnings found by Coverity.
........
r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line
Restore BEGIN/END THREADS macros which were squashed in the previous checkin
........
r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines
Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390
ubuntu buildbots.
........
r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines
Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module.
........
r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines
Use the host the author likely meant in the first place. pop.gmail.com is
reliable. gmail.org is someones personal domain.
........
r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines
Ensure that this test will pass even if another test left an unwritable TESTFN.
Also use the safe unlink in test_support instead of rolling our own here.
........
r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines
#1123: fix the docs for the str.split(None, sep) case.
Also expand a few other methods' docs, which had more info in the deprecated string module docs.
........
r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines
Update docstring of sched, also remove an unused assignment.
........
r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines
Add comments to NamedTuple code.
Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases).
Improve the error message in the case of a SyntaxError (caused by a duplicate field name).
........
r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line
Missed a line in the docs
........
r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line
Better variable names
........
r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines
#1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc.
No need to merge this to py3k!
........
r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line
Make the error messages more specific
........
r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines
Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API
object available as bsddb.db.api. This is based on the patch submitted
by Duncan Grisby here:
http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900
See this thread for additional info:
http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users
It also cleans up the code a little by removing some ifdef/endifs for
python prior to 2.1 and for unsupported Berkeley DB <= 3.2.
........
r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines
Fix a double free when positioning a database cursor to a non-existant
string key (and probably a few other situations with string keys).
This was reported with a patch as pybsddb sourceforge bug 1708868 by
jjjhhhlll at gmail.
........
r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines
Use the highest cPickle protocol in bsddb.dbshelve. This comes from
sourceforge pybsddb patch 1551443 by w_barnes.
........
r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines
remove another sleepycat reference
........
r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines
Allow interrupt only when executing user code in subprocess
Patch 1225 Tal Einat modified from IDLE-Spoon.
........
r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines
Remove file-level typedefs that were inconsistently used throughout the file.
Just move over to the public API names.
Closes issue1238.
........
r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line
Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques.
........
r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines
Allow cursor color change w/o restart. Patch 1725576 Tal Einat.
........
r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines
show paste if > 80 columns. Patch 1659326 Tal Einat.
........
r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines
On OS X, use os.uname() instead of gestalt.sysv(...) to get the
operating system version. This allows to use ctypes when Python
was configured with --disable-toolbox-glue.
........
r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warning about not being able to create an existing directory.
........
r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warnings on a bunch of platforms by using a proper prototype.
........
r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines
Get rid of compiler warning about retval being used (returned) without
being initialized. (gcc warning and Coverity 202)
........
r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line
Fix Coverity 168: Close the file before returning (exiting).
........
r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines
Fix Coverity 180: Don't overallocate. We don't need structs, but pointers.
Also fix a memory leak.
........
r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines
Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory
would be accessed.
Will backport.
........
r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line
Get this module to compile with bsddb versions prior to 4.3
........
r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines
Bug #1216: Restore support for Visual Studio 2002.
Will backport to 2.5.
........
r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line
Fix test of count.__repr__() to ignore the 'L' if the count is a long
........
r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines
Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append
was useless due to inverted logic. Also adds a test case for RECNO dbs
to test_dbshelve.
........
r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix email example.
........
r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix an uncollectable reference leak in bsddb.db.DBShelf.append
........
r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines
Let the O/S supply a port if none of the default ports can be used.
This should make the tests more robust at the expense of allowing
tests to be sloppier by not requiring them to cleanup after themselves.
(It will legitamitely help when running two test suites simultaneously
or if another process is already using one of the predefined ports.)
Also simplifies (slightLy) the exception handling elsewhere.
........
r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines
Don't raise a string exception, they don't work anymore.
........
r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line
Use unittest for assertions
........
r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines
test_bigbits was not testing what it seemed to.
........
r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines
Change a PyErr_Print() into a PyErr_Clear(),
per discussion in issue 1031213.
........
r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line
Improve error messages
........
r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line
More docs, error messages, and tests
........
r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line
Add items
........
r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines
Remove ``:const:`` notation on None in parameter list. Since the markup is not
rendered for parameters it just showed up as ``:const:`None` `` in the output.
........
r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines
Re-order some functions whose parameters differ between PyObject and const char
* so that they are next to each other.
........
r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines
Fix the overflow checking of list_repeat.
Introduce overflow checking into list_inplace_repeat.
Backport candidate, possibly.
........
r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines
Issue #1580738. When HTTPConnection reads the whole stream with read(),
it closes itself. When the stream is read in several calls to read(n),
it should behave in the same way if HTTPConnection knows where the end
of the stream is (through self.length). Added a test case for this
behaviour.
........
r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines
Issue 1289, just a typo.
........
r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines
cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a
keyword argument whenever possible to avoid bugs and confusion. (dbtables.py
line 447 self.db.get using txn as a non-keyword was an actual bug due to this)
........
r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines
Fix a weird bug in dbtables: if it chose a random rowid string that contained
NULL bytes it would cause the database all sorts of problems in the future
leading to very strange random failures and corrupt dbtables.bsdTableDb dbs.
........
r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines
A cleaner fix than the one committed last night. Generate random rowids that
do not contain null bytes.
........
r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines
mention bsddb fixes.
........
r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line
Remove useless warning
........
r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines
squelch the warning that this test is supposed to trigger.
........
r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines
Clarify wording for apply().
........
r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines
Added a cross-ref to each other.
........
r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines
#1284: "S" means "seen", not unread.
........
r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines
Fix ctypes on 32-bit systems when Python is configured --with-system-ffi.
See also https://bugs.launchpad.net/bugs/72505.
Ported from release25-maint branch.
........
r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines
The constructor from tuple was way too permissive: it allowed bad
coefficient numbers, floats in the sign, and other details that
generated directly the wrong number in the best case, or triggered
misfunctionality in the alorithms.
Test cases added for these issues. Thanks Mark Dickinson.
........
r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines
Fix code being interpreted as a target.
........
r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new "cmdoption" directive.
........
r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines
Make a path more Unix-standardy.
........
r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new directive "envvar".
........
r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines
* Add new toplevel chapter, "Using Python." (how to install,
configure and setup python on different platforms -- at least
in theory.)
* Move the Python on Mac docs in that chapter.
* Add a new chapter about the command line invocation, by stargaming.
........
r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines
Change title, for now.
........
r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines
Add entry to ACKS.
........
r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines
Clarify -E docs.
........
r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines
Even more clarification.
........
r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line
Fix protocol name
........
r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line
Various items
........
r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line
Use correct header line
........
r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines
Add a crasher for the long-standing issue with closing a file
while another thread uses it.
........
r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines
Remove duplicate crasher.
........
r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "byte code" to "bytecode". Also sprinkle :term: markup for it.
........
r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines
Add markup to new function descriptions.
........
r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for descriptors.
........
r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "file-descriptor" to "file descriptor".
........
r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term: for generators.
........
r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for iterator.
........
r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for "new-style class".
........
r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line
Add Chris Monson so he can edit PEPs.
........
r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines
Issue #1307, patch by Derek Shockey.
When "MAIL" is received without args, an exception happens instead of
sending a 501 syntax error response.
........
r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line
Add phuang patch from Issue 708374 which adds offset parameter to mmap module.
........
r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines
Bug #1313, fix typo (wrong variable name) in example.
........
r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines
Update Pygments version from externals.
........
r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines
Issue 1307 by Derek Shockey, fox the same bug for RCPT.
Neal: please backport!
........
r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line
Shorter name for namedtuple()
........
r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line
Update name
........
r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup news entry
........
r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line
Optimize sum() for integer and float inputs.
........
r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup error return and add support for intermixed ints and floats/
........
r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line
Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__()
........
r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines
Issue 1290. CharacterData.__repr__ was constructing a string
in response that keeped having a non-ascii character.
........
r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line
Added unittest for calling a function with paramflags (backport from py3k branch).
........
r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*.
........
r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines
Bug #1287: make os.environ.pop() work as expected.
........
r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line
Missing DECREFs
........
r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS
........
r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines
ffi_type_longdouble may be already #defined.
See issue 1324.
........
r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines
Correct an ancient bug in an unused path by removing that path: register() is
now idempotent.
........
r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines
1. Add comments to provide top-level documentation.
2. Refactor to use more descriptive names.
3. Enhance tests in main().
........
r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines
Fix new pop() method on os.environ on ignorecase-platforms.
........
r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line
Update URL for Pygments. 0.8.1 is no longer available
........
r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines
- Add support for FreeBSD 8 which is recently forked from FreeBSD 7.
- Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7.
........
r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines
Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet)
........
r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines
Add confirmation dialog before printing. Patch 1717170 Tal Einat.
........
r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines
Patch 1353 by Jacob Winther.
Add mp4 mapping to mimetypes.py.
........
r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines
Backport fixes for the code that decodes octal escapes (and for PyString
also hex escapes) -- this was reaching beyond the end of the input string
buffer, even though it is not supposed to be \0-terminated.
This has no visible effect but is clearly the correct thing to do.
(In 3.0 it had a visible effect after removing ob_sstate from PyString.)
........
r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines
check in Tal Einat's update to tabpage.py
Patch 1612746
M configDialog.py
M NEWS.txt
AM tabbedpages.py
........
r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines
Use correct markup.
........
r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines
Make example about hiding None return values at the prompt clearer.
........
r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line
Fix some compiler warnings for signed comparisons on Unix and Windows.
........
r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines
Adding Christian Heimes.
........
r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line
Clarify the reasons why pickle is almost always better than marshal
........
r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line
Sets are marshalable.
........
2007-11-02 03:42:39 +08:00
|
|
|
|
address = self.__getaddr('FROM:', arg) if arg else None
|
2001-02-01 06:51:35 +08:00
|
|
|
|
if not address:
|
|
|
|
|
self.push('501 Syntax: MAIL FROM:<address>')
|
|
|
|
|
return
|
2010-07-24 17:51:40 +08:00
|
|
|
|
if self.mailfrom:
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('503 Error: nested MAIL command')
|
|
|
|
|
return
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.mailfrom = address
|
|
|
|
|
print('sender:', self.mailfrom, file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('250 Ok')
|
|
|
|
|
|
|
|
|
|
def smtp_RCPT(self, arg):
|
2012-03-21 04:16:29 +08:00
|
|
|
|
if not self.seen_greeting:
|
|
|
|
|
self.push('503 Error: send HELO first');
|
|
|
|
|
return
|
|
|
|
|
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('===> RCPT', arg, file=DEBUGSTREAM)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
if not self.mailfrom:
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('503 Error: need MAIL command')
|
|
|
|
|
return
|
Merged revisions 58221-58741 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines
Patch #1181: add os.environ.clear() method.
........
r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines
Issue1704287: "make install" fails unless you do "make" first. Make
oldsharedmods and sharedmods in "libinstall".
........
r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines
Patch # 188 by Philip Jenvey.
Make tell() mark CRLF as a newline.
With unit test.
........
r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines
Fix typo and double word.
........
r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines
#1196: document default radix for int().
........
r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines
#1177: accept 2xx responses for https too, not only http.
........
r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line
Remove stray odd character; grammar fix
........
r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line
Typo fix
........
r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line
Add various items
........
r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line
Change to flush and close logic to fix #1760556.
........
r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line
Change to basicConfig() to fix #1021.
........
r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines
#1208: document match object's boolean value.
........
r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line
Minor date change.
........
r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line
Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time.
........
r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines
tuple.__repr__ did not consider a reference loop as it is not possible from
Python code; but it is possible from C. object.__str__ had the issue of not
expecting a type to doing something within it's tp_str implementation that
could trigger an infinite recursion, but it could in C code.. Both found
thanks to BaseException and how it handles its repr.
Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at
coming up with a solution.
........
r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines
Fix error introduced by r58288; if a tuple is length 0 return its repr and
don't worry about any self-referring tuples.
........
r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines
Made the various is_* operations return booleans. This was discussed
with Cawlishaw by mail, and he basically confirmed that to these is_*
operations, there's no need to return Decimal(0) and Decimal(1) if
the language supports the False and True booleans.
Also added a few tests for the these functions in extra.decTest, since
they are mostly untested (apart from the doctests).
Thanks Mark Dickinson
........
r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines
Added a class to store the digits of log(10), so that they can be made
available when necessary without recomputing. Thanks Mark Dickinson
........
r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines
Added note in footnote about string comparisons about
unicodedata.normalize().
........
r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line
enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy.
........
r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line
itertools.count() no longer limited to sys.maxint.
........
r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines
Assume that the user knows when he wants to end the line; don't insert
something he didn't select or complete.
........
r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines
Remove unused theme that was causing a fault in p3k.
........
r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines
Clean up EditorWindow close.
........
r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines
textView cleanup. Patch 1718043 Tal Einat.
M idlelib/EditorWindow.py
M idlelib/aboutDialog.py
M idlelib/textView.py
M idlelib/NEWS.txt
........
r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines
configDialog cleanup. Patch 1730217 Tal Einat.
........
r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines
Coverity #151: Remove deadcode.
All this code already exists above starting at line 653.
........
r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line
wrap lines to <80 characters before fixing errors
........
r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines
Add __asdict__() to NamedTuple and refine the docs.
Add maxlen support to deque() and fixup docs.
Partially fix __reduce__(). The None as a third arg was no longer supported.
Still needs work on __reduce__() to handle recursive inputs.
........
r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines
move descriptions of ac_(in|out)_buffer_size to the right place
http://bugs.python.org/issue1053
........
r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines
dict could be NULL, so we need to XDECREF.
Fix a compiler warning about passing a PyTypeObject* instead of PyObject*.
........
r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines
Fix Coverity #158: Check the correct variable.
........
r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines
Fix Coverity #159.
This code was broken if save() returned a negative number since i contained
a boolean value and then we compared i < 0 which should never be true.
Will backport (assuming it's necessary)
........
r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line
Add a note about fixing some more warnings found by Coverity.
........
r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line
Restore BEGIN/END THREADS macros which were squashed in the previous checkin
........
r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines
Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390
ubuntu buildbots.
........
r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines
Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module.
........
r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines
Use the host the author likely meant in the first place. pop.gmail.com is
reliable. gmail.org is someones personal domain.
........
r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines
Ensure that this test will pass even if another test left an unwritable TESTFN.
Also use the safe unlink in test_support instead of rolling our own here.
........
r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines
#1123: fix the docs for the str.split(None, sep) case.
Also expand a few other methods' docs, which had more info in the deprecated string module docs.
........
r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines
Update docstring of sched, also remove an unused assignment.
........
r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines
Add comments to NamedTuple code.
Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases).
Improve the error message in the case of a SyntaxError (caused by a duplicate field name).
........
r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line
Missed a line in the docs
........
r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line
Better variable names
........
r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines
#1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc.
No need to merge this to py3k!
........
r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line
Eliminate camelcase function name
........
r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line
Make the error messages more specific
........
r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines
Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API
object available as bsddb.db.api. This is based on the patch submitted
by Duncan Grisby here:
http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900
See this thread for additional info:
http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users
It also cleans up the code a little by removing some ifdef/endifs for
python prior to 2.1 and for unsupported Berkeley DB <= 3.2.
........
r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines
Fix a double free when positioning a database cursor to a non-existant
string key (and probably a few other situations with string keys).
This was reported with a patch as pybsddb sourceforge bug 1708868 by
jjjhhhlll at gmail.
........
r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines
Use the highest cPickle protocol in bsddb.dbshelve. This comes from
sourceforge pybsddb patch 1551443 by w_barnes.
........
r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines
remove another sleepycat reference
........
r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines
Allow interrupt only when executing user code in subprocess
Patch 1225 Tal Einat modified from IDLE-Spoon.
........
r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines
Remove file-level typedefs that were inconsistently used throughout the file.
Just move over to the public API names.
Closes issue1238.
........
r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line
Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques.
........
r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines
Allow cursor color change w/o restart. Patch 1725576 Tal Einat.
........
r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines
show paste if > 80 columns. Patch 1659326 Tal Einat.
........
r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines
On OS X, use os.uname() instead of gestalt.sysv(...) to get the
operating system version. This allows to use ctypes when Python
was configured with --disable-toolbox-glue.
........
r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warning about not being able to create an existing directory.
........
r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line
Get rid of warnings on a bunch of platforms by using a proper prototype.
........
r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines
Get rid of compiler warning about retval being used (returned) without
being initialized. (gcc warning and Coverity 202)
........
r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line
Fix Coverity 168: Close the file before returning (exiting).
........
r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines
Fix Coverity 180: Don't overallocate. We don't need structs, but pointers.
Also fix a memory leak.
........
r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines
Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory
would be accessed.
Will backport.
........
r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line
Get this module to compile with bsddb versions prior to 4.3
........
r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines
Bug #1216: Restore support for Visual Studio 2002.
Will backport to 2.5.
........
r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line
Fix test of count.__repr__() to ignore the 'L' if the count is a long
........
r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines
Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append
was useless due to inverted logic. Also adds a test case for RECNO dbs
to test_dbshelve.
........
r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix email example.
........
r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines
Fix an uncollectable reference leak in bsddb.db.DBShelf.append
........
r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines
Let the O/S supply a port if none of the default ports can be used.
This should make the tests more robust at the expense of allowing
tests to be sloppier by not requiring them to cleanup after themselves.
(It will legitamitely help when running two test suites simultaneously
or if another process is already using one of the predefined ports.)
Also simplifies (slightLy) the exception handling elsewhere.
........
r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines
Don't raise a string exception, they don't work anymore.
........
r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line
Use unittest for assertions
........
r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines
test_bigbits was not testing what it seemed to.
........
r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines
Change a PyErr_Print() into a PyErr_Clear(),
per discussion in issue 1031213.
........
r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line
Improve error messages
........
r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line
More docs, error messages, and tests
........
r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line
Add items
........
r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines
Remove ``:const:`` notation on None in parameter list. Since the markup is not
rendered for parameters it just showed up as ``:const:`None` `` in the output.
........
r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines
Re-order some functions whose parameters differ between PyObject and const char
* so that they are next to each other.
........
r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines
Fix the overflow checking of list_repeat.
Introduce overflow checking into list_inplace_repeat.
Backport candidate, possibly.
........
r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines
Issue #1580738. When HTTPConnection reads the whole stream with read(),
it closes itself. When the stream is read in several calls to read(n),
it should behave in the same way if HTTPConnection knows where the end
of the stream is (through self.length). Added a test case for this
behaviour.
........
r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines
Issue 1289, just a typo.
........
r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines
cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a
keyword argument whenever possible to avoid bugs and confusion. (dbtables.py
line 447 self.db.get using txn as a non-keyword was an actual bug due to this)
........
r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines
Fix a weird bug in dbtables: if it chose a random rowid string that contained
NULL bytes it would cause the database all sorts of problems in the future
leading to very strange random failures and corrupt dbtables.bsdTableDb dbs.
........
r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines
A cleaner fix than the one committed last night. Generate random rowids that
do not contain null bytes.
........
r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines
mention bsddb fixes.
........
r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line
Remove useless warning
........
r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines
squelch the warning that this test is supposed to trigger.
........
r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines
Clarify wording for apply().
........
r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines
Added a cross-ref to each other.
........
r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines
#1284: "S" means "seen", not unread.
........
r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines
Fix ctypes on 32-bit systems when Python is configured --with-system-ffi.
See also https://bugs.launchpad.net/bugs/72505.
Ported from release25-maint branch.
........
r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines
The constructor from tuple was way too permissive: it allowed bad
coefficient numbers, floats in the sign, and other details that
generated directly the wrong number in the best case, or triggered
misfunctionality in the alorithms.
Test cases added for these issues. Thanks Mark Dickinson.
........
r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines
Fix code being interpreted as a target.
........
r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new "cmdoption" directive.
........
r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines
Make a path more Unix-standardy.
........
r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines
Document new directive "envvar".
........
r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines
* Add new toplevel chapter, "Using Python." (how to install,
configure and setup python on different platforms -- at least
in theory.)
* Move the Python on Mac docs in that chapter.
* Add a new chapter about the command line invocation, by stargaming.
........
r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines
Change title, for now.
........
r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines
Add entry to ACKS.
........
r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines
Clarify -E docs.
........
r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines
Even more clarification.
........
r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line
Fix protocol name
........
r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line
Various items
........
r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line
Use correct header line
........
r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines
Add a crasher for the long-standing issue with closing a file
while another thread uses it.
........
r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines
Remove duplicate crasher.
........
r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "byte code" to "bytecode". Also sprinkle :term: markup for it.
........
r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines
Add markup to new function descriptions.
........
r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for descriptors.
........
r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines
Unify "file-descriptor" to "file descriptor".
........
r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term: for generators.
........
r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for iterator.
........
r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines
Add :term:s for "new-style class".
........
r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line
Add Chris Monson so he can edit PEPs.
........
r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines
Issue #1307, patch by Derek Shockey.
When "MAIL" is received without args, an exception happens instead of
sending a 501 syntax error response.
........
r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line
Add phuang patch from Issue 708374 which adds offset parameter to mmap module.
........
r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines
Bug #1313, fix typo (wrong variable name) in example.
........
r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines
Update Pygments version from externals.
........
r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines
Issue 1307 by Derek Shockey, fox the same bug for RCPT.
Neal: please backport!
........
r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line
Shorter name for namedtuple()
........
r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line
Update name
........
r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup news entry
........
r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line
Optimize sum() for integer and float inputs.
........
r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line
Fixup error return and add support for intermixed ints and floats/
........
r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line
Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__()
........
r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines
Issue 1290. CharacterData.__repr__ was constructing a string
in response that keeped having a non-ascii character.
........
r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line
Added unittest for calling a function with paramflags (backport from py3k branch).
........
r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*.
........
r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines
Bug #1287: make os.environ.pop() work as expected.
........
r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line
Missing DECREFs
........
r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines
- Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS
........
r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines
ffi_type_longdouble may be already #defined.
See issue 1324.
........
r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines
Correct an ancient bug in an unused path by removing that path: register() is
now idempotent.
........
r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines
1. Add comments to provide top-level documentation.
2. Refactor to use more descriptive names.
3. Enhance tests in main().
........
r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines
Fix new pop() method on os.environ on ignorecase-platforms.
........
r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line
Update URL for Pygments. 0.8.1 is no longer available
........
r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines
- Add support for FreeBSD 8 which is recently forked from FreeBSD 7.
- Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7.
........
r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines
Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet)
........
r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines
Add confirmation dialog before printing. Patch 1717170 Tal Einat.
........
r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines
Patch 1353 by Jacob Winther.
Add mp4 mapping to mimetypes.py.
........
r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines
Backport fixes for the code that decodes octal escapes (and for PyString
also hex escapes) -- this was reaching beyond the end of the input string
buffer, even though it is not supposed to be \0-terminated.
This has no visible effect but is clearly the correct thing to do.
(In 3.0 it had a visible effect after removing ob_sstate from PyString.)
........
r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines
check in Tal Einat's update to tabpage.py
Patch 1612746
M configDialog.py
M NEWS.txt
AM tabbedpages.py
........
r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines
Use correct markup.
........
r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines
Make example about hiding None return values at the prompt clearer.
........
r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line
Fix some compiler warnings for signed comparisons on Unix and Windows.
........
r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines
Adding Christian Heimes.
........
r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line
Clarify the reasons why pickle is almost always better than marshal
........
r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line
Sets are marshalable.
........
2007-11-02 03:42:39 +08:00
|
|
|
|
address = self.__getaddr('TO:', arg) if arg else None
|
2001-02-01 06:51:35 +08:00
|
|
|
|
if not address:
|
|
|
|
|
self.push('501 Syntax: RCPT TO: <address>')
|
|
|
|
|
return
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.rcpttos.append(address)
|
|
|
|
|
print('recips:', self.rcpttos, file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('250 Ok')
|
|
|
|
|
|
|
|
|
|
def smtp_RSET(self, arg):
|
|
|
|
|
if arg:
|
|
|
|
|
self.push('501 Syntax: RSET')
|
|
|
|
|
return
|
|
|
|
|
# Resets the sender, recipients, and data, but not the greeting
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.mailfrom = None
|
|
|
|
|
self.rcpttos = []
|
|
|
|
|
self.received_data = ''
|
|
|
|
|
self.smtp_state = self.COMMAND
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('250 Ok')
|
|
|
|
|
|
|
|
|
|
def smtp_DATA(self, arg):
|
2012-03-21 04:16:29 +08:00
|
|
|
|
if not self.seen_greeting:
|
|
|
|
|
self.push('503 Error: send HELO first');
|
|
|
|
|
return
|
|
|
|
|
|
2010-07-24 17:51:40 +08:00
|
|
|
|
if not self.rcpttos:
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('503 Error: need RCPT command')
|
|
|
|
|
return
|
|
|
|
|
if arg:
|
|
|
|
|
self.push('501 Syntax: DATA')
|
|
|
|
|
return
|
2010-07-24 17:51:40 +08:00
|
|
|
|
self.smtp_state = self.DATA
|
2008-07-07 12:15:08 +08:00
|
|
|
|
self.set_terminator(b'\r\n.\r\n')
|
2001-02-01 06:51:35 +08:00
|
|
|
|
self.push('354 End data with <CR><LF>.<CR><LF>')
|
|
|
|
|
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
class SMTPServer(asyncore.dispatcher):
|
2010-07-24 17:51:40 +08:00
|
|
|
|
# SMTPChannel class to use for managing client connections
|
|
|
|
|
channel_class = SMTPChannel
|
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
def __init__(self, localaddr, remoteaddr):
|
|
|
|
|
self._localaddr = localaddr
|
|
|
|
|
self._remoteaddr = remoteaddr
|
|
|
|
|
asyncore.dispatcher.__init__(self)
|
2010-07-01 01:47:39 +08:00
|
|
|
|
try:
|
|
|
|
|
self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
|
|
|
# try to re-use a server port if possible
|
|
|
|
|
self.set_reuse_addr()
|
|
|
|
|
self.bind(localaddr)
|
|
|
|
|
self.listen(5)
|
|
|
|
|
except:
|
|
|
|
|
self.close()
|
|
|
|
|
raise
|
|
|
|
|
else:
|
|
|
|
|
print('%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % (
|
|
|
|
|
self.__class__.__name__, time.ctime(time.time()),
|
|
|
|
|
localaddr, remoteaddr), file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
2010-10-05 05:08:36 +08:00
|
|
|
|
def handle_accepted(self, conn, addr):
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('Incoming connection from %s' % repr(addr), file=DEBUGSTREAM)
|
2010-07-24 17:51:40 +08:00
|
|
|
|
channel = self.channel_class(self, conn, addr)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
# API for "doing something useful with the message"
|
|
|
|
|
def process_message(self, peer, mailfrom, rcpttos, data):
|
|
|
|
|
"""Override this abstract method to handle messages from the client.
|
|
|
|
|
|
|
|
|
|
peer is a tuple containing (ipaddr, port) of the client that made the
|
|
|
|
|
socket connection to our smtp port.
|
|
|
|
|
|
|
|
|
|
mailfrom is the raw address the client claims the message is coming
|
|
|
|
|
from.
|
|
|
|
|
|
|
|
|
|
rcpttos is a list of raw addresses the client wishes to deliver the
|
|
|
|
|
message to.
|
|
|
|
|
|
|
|
|
|
data is a string containing the entire full text of the message,
|
|
|
|
|
headers (if supplied) and all. It has been `de-transparencied'
|
|
|
|
|
according to RFC 821, Section 4.5.2. In other words, a line
|
|
|
|
|
containing a `.' followed by other text has had the leading dot
|
|
|
|
|
removed.
|
|
|
|
|
|
|
|
|
|
This function should return None, for a normal `250 Ok' response;
|
|
|
|
|
otherwise it returns the desired response string in RFC 821 format.
|
|
|
|
|
|
|
|
|
|
"""
|
2001-04-15 21:06:04 +08:00
|
|
|
|
raise NotImplementedError
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
2001-02-10 04:06:00 +08:00
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
class DebuggingServer(SMTPServer):
|
|
|
|
|
# Do something with the gathered message
|
|
|
|
|
def process_message(self, peer, mailfrom, rcpttos, data):
|
|
|
|
|
inheaders = 1
|
|
|
|
|
lines = data.split('\n')
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('---------- MESSAGE FOLLOWS ----------')
|
2001-02-01 06:51:35 +08:00
|
|
|
|
for line in lines:
|
|
|
|
|
# headers first
|
|
|
|
|
if inheaders and not line:
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('X-Peer:', peer[0])
|
2001-02-01 06:51:35 +08:00
|
|
|
|
inheaders = 0
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print(line)
|
|
|
|
|
print('------------ END MESSAGE ------------')
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
class PureProxy(SMTPServer):
|
|
|
|
|
def process_message(self, peer, mailfrom, rcpttos, data):
|
|
|
|
|
lines = data.split('\n')
|
|
|
|
|
# Look for the last header
|
|
|
|
|
i = 0
|
|
|
|
|
for line in lines:
|
|
|
|
|
if not line:
|
|
|
|
|
break
|
|
|
|
|
i += 1
|
|
|
|
|
lines.insert(i, 'X-Peer: %s' % peer[0])
|
|
|
|
|
data = NEWLINE.join(lines)
|
|
|
|
|
refused = self._deliver(mailfrom, rcpttos, data)
|
|
|
|
|
# TBD: what to do with refused addresses?
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('we got some refusals:', refused, file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
|
|
|
|
|
def _deliver(self, mailfrom, rcpttos, data):
|
|
|
|
|
import smtplib
|
|
|
|
|
refused = {}
|
|
|
|
|
try:
|
|
|
|
|
s = smtplib.SMTP()
|
|
|
|
|
s.connect(self._remoteaddr[0], self._remoteaddr[1])
|
|
|
|
|
try:
|
|
|
|
|
refused = s.sendmail(mailfrom, rcpttos, data)
|
|
|
|
|
finally:
|
|
|
|
|
s.quit()
|
2007-01-11 00:19:56 +08:00
|
|
|
|
except smtplib.SMTPRecipientsRefused as e:
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('got SMTPRecipientsRefused', file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
refused = e.recipients
|
2007-01-11 00:19:56 +08:00
|
|
|
|
except (socket.error, smtplib.SMTPException) as e:
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('got', e.__class__, file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
# All recipients were refused. If the exception had an associated
|
|
|
|
|
# error code, use it. Otherwise,fake it with a non-triggering
|
|
|
|
|
# exception code.
|
|
|
|
|
errcode = getattr(e, 'smtp_code', -1)
|
|
|
|
|
errmsg = getattr(e, 'smtp_error', 'ignore')
|
|
|
|
|
for r in rcpttos:
|
|
|
|
|
refused[r] = (errcode, errmsg)
|
|
|
|
|
return refused
|
|
|
|
|
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
class MailmanProxy(PureProxy):
|
|
|
|
|
def process_message(self, peer, mailfrom, rcpttos, data):
|
2007-05-18 08:51:22 +08:00
|
|
|
|
from io import StringIO
|
2001-02-01 06:51:35 +08:00
|
|
|
|
from Mailman import Utils
|
|
|
|
|
from Mailman import Message
|
|
|
|
|
from Mailman import MailList
|
|
|
|
|
# If the message is to a Mailman mailing list, then we'll invoke the
|
|
|
|
|
# Mailman script directly, without going through the real smtpd.
|
|
|
|
|
# Otherwise we'll forward it to the local proxy for disposition.
|
|
|
|
|
listnames = []
|
|
|
|
|
for rcpt in rcpttos:
|
|
|
|
|
local = rcpt.lower().split('@')[0]
|
|
|
|
|
# We allow the following variations on the theme
|
|
|
|
|
# listname
|
|
|
|
|
# listname-admin
|
|
|
|
|
# listname-owner
|
|
|
|
|
# listname-request
|
|
|
|
|
# listname-join
|
|
|
|
|
# listname-leave
|
|
|
|
|
parts = local.split('-')
|
|
|
|
|
if len(parts) > 2:
|
|
|
|
|
continue
|
|
|
|
|
listname = parts[0]
|
|
|
|
|
if len(parts) == 2:
|
|
|
|
|
command = parts[1]
|
|
|
|
|
else:
|
|
|
|
|
command = ''
|
|
|
|
|
if not Utils.list_exists(listname) or command not in (
|
|
|
|
|
'', 'admin', 'owner', 'request', 'join', 'leave'):
|
|
|
|
|
continue
|
|
|
|
|
listnames.append((rcpt, listname, command))
|
|
|
|
|
# Remove all list recipients from rcpttos and forward what we're not
|
|
|
|
|
# going to take care of ourselves. Linear removal should be fine
|
|
|
|
|
# since we don't expect a large number of recipients.
|
|
|
|
|
for rcpt, listname, command in listnames:
|
|
|
|
|
rcpttos.remove(rcpt)
|
2001-02-10 04:06:00 +08:00
|
|
|
|
# If there's any non-list destined recipients left,
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('forwarding recips:', ' '.join(rcpttos), file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
if rcpttos:
|
|
|
|
|
refused = self._deliver(mailfrom, rcpttos, data)
|
|
|
|
|
# TBD: what to do with refused addresses?
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('we got refusals:', refused, file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
# Now deliver directly to the list commands
|
|
|
|
|
mlists = {}
|
|
|
|
|
s = StringIO(data)
|
|
|
|
|
msg = Message.Message(s)
|
|
|
|
|
# These headers are required for the proper execution of Mailman. All
|
2009-02-22 04:59:32 +08:00
|
|
|
|
# MTAs in existence seem to add these if the original message doesn't
|
2001-02-01 06:51:35 +08:00
|
|
|
|
# have them.
|
2008-06-12 12:06:45 +08:00
|
|
|
|
if not msg.get('from'):
|
2001-02-01 06:51:35 +08:00
|
|
|
|
msg['From'] = mailfrom
|
2008-06-12 12:06:45 +08:00
|
|
|
|
if not msg.get('date'):
|
2001-02-01 06:51:35 +08:00
|
|
|
|
msg['Date'] = time.ctime(time.time())
|
|
|
|
|
for rcpt, listname, command in listnames:
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('sending message to', rcpt, file=DEBUGSTREAM)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
mlist = mlists.get(listname)
|
|
|
|
|
if not mlist:
|
|
|
|
|
mlist = MailList.MailList(listname, lock=0)
|
|
|
|
|
mlists[listname] = mlist
|
|
|
|
|
# dispatch on the type of command
|
|
|
|
|
if command == '':
|
|
|
|
|
# post
|
|
|
|
|
msg.Enqueue(mlist, tolist=1)
|
|
|
|
|
elif command == 'admin':
|
|
|
|
|
msg.Enqueue(mlist, toadmin=1)
|
|
|
|
|
elif command == 'owner':
|
|
|
|
|
msg.Enqueue(mlist, toowner=1)
|
|
|
|
|
elif command == 'request':
|
|
|
|
|
msg.Enqueue(mlist, torequest=1)
|
|
|
|
|
elif command in ('join', 'leave'):
|
|
|
|
|
# TBD: this is a hack!
|
|
|
|
|
if command == 'join':
|
|
|
|
|
msg['Subject'] = 'subscribe'
|
|
|
|
|
else:
|
|
|
|
|
msg['Subject'] = 'unsubscribe'
|
|
|
|
|
msg.Enqueue(mlist, torequest=1)
|
|
|
|
|
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
class Options:
|
|
|
|
|
setuid = 1
|
|
|
|
|
classname = 'PureProxy'
|
|
|
|
|
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
def parseargs():
|
|
|
|
|
global DEBUGSTREAM
|
|
|
|
|
try:
|
|
|
|
|
opts, args = getopt.getopt(
|
|
|
|
|
sys.argv[1:], 'nVhc:d',
|
|
|
|
|
['class=', 'nosetuid', 'version', 'help', 'debug'])
|
2007-01-11 00:19:56 +08:00
|
|
|
|
except getopt.error as e:
|
2001-02-01 06:51:35 +08:00
|
|
|
|
usage(1, e)
|
|
|
|
|
|
|
|
|
|
options = Options()
|
|
|
|
|
for opt, arg in opts:
|
|
|
|
|
if opt in ('-h', '--help'):
|
|
|
|
|
usage(0)
|
|
|
|
|
elif opt in ('-V', '--version'):
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print(__version__, file=sys.stderr)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
sys.exit(0)
|
|
|
|
|
elif opt in ('-n', '--nosetuid'):
|
|
|
|
|
options.setuid = 0
|
|
|
|
|
elif opt in ('-c', '--class'):
|
|
|
|
|
options.classname = arg
|
|
|
|
|
elif opt in ('-d', '--debug'):
|
|
|
|
|
DEBUGSTREAM = sys.stderr
|
|
|
|
|
|
|
|
|
|
# parse the rest of the arguments
|
2001-10-05 00:27:04 +08:00
|
|
|
|
if len(args) < 1:
|
|
|
|
|
localspec = 'localhost:8025'
|
|
|
|
|
remotespec = 'localhost:25'
|
|
|
|
|
elif len(args) < 2:
|
2001-02-01 06:51:35 +08:00
|
|
|
|
localspec = args[0]
|
2001-10-05 00:27:04 +08:00
|
|
|
|
remotespec = 'localhost:25'
|
2001-11-04 11:04:25 +08:00
|
|
|
|
elif len(args) < 3:
|
|
|
|
|
localspec = args[0]
|
|
|
|
|
remotespec = args[1]
|
2001-10-05 00:27:04 +08:00
|
|
|
|
else:
|
|
|
|
|
usage(1, 'Invalid arguments: %s' % COMMASPACE.join(args))
|
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
# split into host/port pairs
|
|
|
|
|
i = localspec.find(':')
|
|
|
|
|
if i < 0:
|
2001-10-05 00:27:04 +08:00
|
|
|
|
usage(1, 'Bad local spec: %s' % localspec)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
options.localhost = localspec[:i]
|
|
|
|
|
try:
|
|
|
|
|
options.localport = int(localspec[i+1:])
|
|
|
|
|
except ValueError:
|
2001-10-05 00:27:04 +08:00
|
|
|
|
usage(1, 'Bad local port: %s' % localspec)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
i = remotespec.find(':')
|
|
|
|
|
if i < 0:
|
2001-10-05 00:27:04 +08:00
|
|
|
|
usage(1, 'Bad remote spec: %s' % remotespec)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
options.remotehost = remotespec[:i]
|
|
|
|
|
try:
|
|
|
|
|
options.remoteport = int(remotespec[i+1:])
|
|
|
|
|
except ValueError:
|
2001-10-05 00:27:04 +08:00
|
|
|
|
usage(1, 'Bad remote port: %s' % remotespec)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
return options
|
|
|
|
|
|
|
|
|
|
|
2001-10-05 00:27:04 +08:00
|
|
|
|
|
2001-02-01 06:51:35 +08:00
|
|
|
|
if __name__ == '__main__':
|
|
|
|
|
options = parseargs()
|
|
|
|
|
# Become nobody
|
2011-10-21 05:03:43 +08:00
|
|
|
|
classname = options.classname
|
|
|
|
|
if "." in classname:
|
|
|
|
|
lastdot = classname.rfind(".")
|
|
|
|
|
mod = __import__(classname[:lastdot], globals(), locals(), [""])
|
|
|
|
|
classname = classname[lastdot+1:]
|
|
|
|
|
else:
|
|
|
|
|
import __main__ as mod
|
|
|
|
|
class_ = getattr(mod, classname)
|
|
|
|
|
proxy = class_((options.localhost, options.localport),
|
|
|
|
|
(options.remotehost, options.remoteport))
|
2001-02-01 06:51:35 +08:00
|
|
|
|
if options.setuid:
|
|
|
|
|
try:
|
|
|
|
|
import pwd
|
|
|
|
|
except ImportError:
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('Cannot import module "pwd"; try running with -n option.', file=sys.stderr)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
sys.exit(1)
|
|
|
|
|
nobody = pwd.getpwnam('nobody')[2]
|
|
|
|
|
try:
|
|
|
|
|
os.setuid(nobody)
|
2007-01-11 00:19:56 +08:00
|
|
|
|
except OSError as e:
|
2001-03-02 14:42:34 +08:00
|
|
|
|
if e.errno != errno.EPERM: raise
|
2007-02-09 13:37:30 +08:00
|
|
|
|
print('Cannot setuid "nobody"; try running with -n option.', file=sys.stderr)
|
2001-02-01 06:51:35 +08:00
|
|
|
|
sys.exit(1)
|
|
|
|
|
try:
|
|
|
|
|
asyncore.loop()
|
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
|
pass
|