summaryrefslogtreecommitdiffstats
path: root/Lib/struct.py
diff options
context:
space:
mode:
authorMartin Blais <blais@furius.ca>2006-06-04 13:49:49 (GMT)
committerMartin Blais <blais@furius.ca>2006-06-04 13:49:49 (GMT)
commitaf2ae72cb20e853091faad0dd11d51e97539881d (patch)
tree218d426ffb6408a97dcf7ff2055cc4b28476b1b5 /Lib/struct.py
parent63f0db682e00d051466e5d739ba85f2a30279eef (diff)
downloadcpython-af2ae72cb20e853091faad0dd11d51e97539881d.zip
cpython-af2ae72cb20e853091faad0dd11d51e97539881d.tar.gz
cpython-af2ae72cb20e853091faad0dd11d51e97539881d.tar.bz2
Fixes in struct and socket from merge reviews.
- Following Guido's comments, renamed * pack_to -> pack_into * recv_buf -> recv_into * recvfrom_buf -> recvfrom_into - Made fixes to _struct.c according to Neal Norwitz comments on the checkins list. - Converted some ints into the appropriate -- I hope -- ssize_t and size_t.
Diffstat (limited to 'Lib/struct.py')
-rw-r--r--Lib/struct.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/struct.py b/Lib/struct.py
index 51ee29a..9113e71 100644
--- a/Lib/struct.py
+++ b/Lib/struct.py
@@ -62,7 +62,7 @@ def pack(fmt, *args):
o = _compile(fmt)
return o.pack(*args)
-def pack_to(fmt, buf, offset, *args):
+def pack_into(fmt, buf, offset, *args):
"""
Pack the values v2, v2, ... according to fmt, write
the packed bytes into the writable buffer buf starting at offset.
@@ -72,7 +72,7 @@ def pack_to(fmt, buf, offset, *args):
o = _cache[fmt]
except KeyError:
o = _compile(fmt)
- return o.pack_to(buf, offset, *args)
+ return o.pack_into(buf, offset, *args)
def unpack(fmt, s):
"""