← Back to branch summary

~pythonregexp2.7/python/issue2636-22

« back to all changes in this revision

Viewing changes to Lib/poplib.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-06-09 14:36:32 UTC
  • mfrom: (39021.1.402 Regexp-2.6)
  • Revision ID: darklord@timehorse.com-20080609143632-wwwkx92u1t5l7yd3
Merged in changes from the latest python source snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/poplib.py
76
76
    """
77
77
 
78
78
 
79
 
    def __init__(self, host, port=POP3_PORT, timeout=None):
 
79
    def __init__(self, host, port=POP3_PORT,
 
80
                 timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
80
81
        self.host = host
81
82
        self.port = port
82
83
        self.sock = socket.create_connection((host, port), timeout)