Author: Philip Jenvey <pjen...@underboss.org>
Branch:
Changeset: r73477:9580ada38c4c
Date: 2014-07-27 11:36 -0700
http://bitbucket.org/pypy/pypy/changeset/9580ada38c4c/
Log: simplify (grafted from 50402333035102e8dcce27b9d01a3f14a26f8c73)
diff --git a/pypy/module/operator/tscmp.py b/pypy/module/operator/tscmp.py
--- a/pypy/module/operator/tscmp.py
+++ b/pypy/module/operator/tscmp.py
@@ -31,17 +31,15 @@
if (space.isinstance_w(w_a, space.w_unicode) and
space.isinstance_w(w_b, space.w_unicode)):
try:
- a_value = space.call_method(w_a, "encode", space.wrap("ascii"))
- b_value = space.call_method(w_b, "encode", space.wrap("ascii"))
- return compare_digest_buffer(space, a_value, b_value)
+ w_a = space.call_method(w_a, 'encode', space.wrap('ascii'))
+ w_b = space.call_method(w_b, 'encode', space.wrap('ascii'))
except OperationError as e:
if not e.match(space, space.w_UnicodeEncodeError):
raise
raise oefmt(space.w_TypeError,
"comparing strings with non-ASCII characters is not "
"supported")
- else:
- return compare_digest_buffer(space, w_a, w_b)
+ return compare_digest_buffer(space, w_a, w_b)
def compare_digest_buffer(space, w_a, w_b):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
