Author: Brian Kearns <[email protected]>
Branch: py3k
Changeset: r62269:6823e86baaea
Date: 2013-03-09 00:38 -0500
http://bitbucket.org/pypy/pypy/changeset/6823e86baaea/
Log: merge default
diff --git a/lib_pypy/_md5.py b/lib_pypy/_md5.py
--- a/lib_pypy/_md5.py
+++ b/lib_pypy/_md5.py
@@ -319,7 +319,7 @@
else:
padLen = 120 - index
- padding = [0o200] + [0] * 63
+ padding = [b'\200'] + [b'\000'] * 63
self.update(padding[:padLen])
# Append length (before padding).
diff --git a/lib_pypy/_pypy_irc_topic.py b/lib_pypy/_pypy_irc_topic.py
--- a/lib_pypy/_pypy_irc_topic.py
+++ b/lib_pypy/_pypy_irc_topic.py
@@ -168,7 +168,7 @@
"""
from string import ascii_uppercase, ascii_lowercase
-
+
def rot13(data):
""" A simple rot-13 encoder since `str.encode('rot13')` was removed from
Python as of version 3.0. It rotates both uppercase and lowercase
letters individually.
@@ -184,7 +184,7 @@
else:
total.append(char)
return "".join(total)
-
+
def some_topic():
import time
lines = __doc__.splitlines()
diff --git a/lib_pypy/_structseq.py b/lib_pypy/_structseq.py
--- a/lib_pypy/_structseq.py
+++ b/lib_pypy/_structseq.py
@@ -43,8 +43,7 @@
field.__name__ = name
dict['n_fields'] = len(fields_by_index)
- extra_fields = list(fields_by_index.items())
- extra_fields.sort()
+ extra_fields = sorted(fields_by_index.items())
n_sequence_fields = 0
while extra_fields and extra_fields[0][0] == n_sequence_fields:
extra_fields.pop(0)
diff --git a/lib_pypy/pwd.py b/lib_pypy/pwd.py
--- a/lib_pypy/pwd.py
+++ b/lib_pypy/pwd.py
@@ -166,9 +166,9 @@
from os import getuid
uid = getuid()
pw = getpwuid(uid)
- print(("uid %s: %s" % (pw.pw_uid, pw)))
+ print("uid %s: %s" % (pw.pw_uid, pw))
name = pw.pw_name
- print(("name %r: %s" % (name, getpwnam(name))))
+ print("name %r: %s" % (name, getpwnam(name)))
print("All:")
for pw in getpwall():
print(pw)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
