[pypy-commit] pypy py3k: we no longer need to pass unicode literals to operationerrfmt, because now the exception messages are unicode anyway

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r56569:c1cfe5e32d5d
Date: 2012-08-04 15:20 +0200
http://bitbucket.org/pypy/pypy/changeset/c1cfe5e32d5d/

Log:	we no longer need to pass unicode literals to operationerrfmt,
	because now the exception messages are unicode anyway

diff --git a/pypy/interpreter/argument.py b/pypy/interpreter/argument.py
--- a/pypy/interpreter/argument.py
+++ b/pypy/interpreter/argument.py
@@ -2,7 +2,6 @@
 Arguments objects.
 """
 
-from pypy.tool.sourcetools import with_unicode_literals
 from pypy.interpreter.error import OperationError, operationerrfmt
 from pypy.rlib.debug import make_sure_not_resized
 from pypy.rlib import jit
@@ -215,7 +214,6 @@
         self._do_combine_starstarargs_wrapped(keys_w, w_starstararg)
         return True
 
-    @with_unicode_literals
     def _do_combine_starstarargs_wrapped(self, keys_w, w_starstararg):
         space = self.space
         keywords_w = [None] * len(keys_w)
@@ -473,7 +471,6 @@
         return co_argcount + has_vararg + has_kwarg + co_kwonlyargcount
 
 
-    @with_unicode_literals
     def parse_into_scope(self, w_firstarg,
                          scope_w, fnname, signature, defaults_w=None,
                          w_kw_defs=None):
@@ -745,7 +742,6 @@
     def __init__(self, argname):
         self.argname = argname
 
-    @with_unicode_literals
     def getmsg(self):
         msg = "got multiple values for keyword argument '%s'" % (
             self.argname)
@@ -777,7 +773,6 @@
                     break
         self.kwd_name = name
 
-    @with_unicode_literals
     def getmsg(self):
         if self.num_kwds == 1:
             msg = "got an unexpected keyword argument '%s'" % (