From d4c2bddd0c768da12d0cefd3c405b10e75fa5aa9 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Thu, 5 Jun 2014 19:44:54 +0100
Subject: py: Raise TypeError when trying to format non-int with %x,%o,%X.

This behaviour follows Python 3.5 standard (in 3.4 it's a
DeprecationWarning which we'd rather make a TypeError).
---
 py/objstr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'py/objstr.c')

diff --git a/py/objstr.c b/py/objstr.c
index 4100b69be..593c39cb0 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1273,7 +1273,7 @@ not_enough_args:
                 if (alt) {
                     flags |= (PF_FLAG_SHOW_PREFIX | PF_FLAG_SHOW_OCTAL_LETTER);
                 }
-                pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 8, 'a', flags, fill, width);
+                pfenv_print_mp_int(&pfenv_vstr, arg, 1, 8, 'a', flags, fill, width);
                 break;
 
             case 'r':
@@ -1296,7 +1296,7 @@ not_enough_args:
 
             case 'X':
             case 'x':
-                pfenv_print_mp_int(&pfenv_vstr, arg_as_int(arg), 1, 16, *str - ('X' - 'A'), flags | alt, fill, width);
+                pfenv_print_mp_int(&pfenv_vstr, arg, 1, 16, *str - ('X' - 'A'), flags | alt, fill, width);
                 break;
 
             default:
-- 
cgit v1.2.3