Merge branch 'master' of github.com:micropython/micropython

1 files changed, 11 insertions, 1 deletions

diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 21e3202a9..39ea7ca11 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "nlr.h"
 #include "misc.h"
@@ -97,15 +98,24 @@ mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
             case RT_BINARY_OP_INPLACE_FLOOR_DIVIDE: {
                 mpz_t rem; mpz_init_zero(&rem);
                 mpz_divmod_inpl(&res->mpz, &rem, zlhs, zrhs);
+		        if (zlhs->neg != zrhs->neg) {
+                    if (!mpz_is_zero(&rem)) {
+                        mpz_t mpzone; mpz_init_from_int(&mpzone, -1);
+                        mpz_add_inpl(&res->mpz, &res->mpz, &mpzone);
+                    }
+                }
                 mpz_deinit(&rem);
                 break;
             }
             case RT_BINARY_OP_MODULO:
             case RT_BINARY_OP_INPLACE_MODULO: {
-                // TODO check that this operation matches the CPython operation
                 mpz_t quo; mpz_init_zero(&quo);
                 mpz_divmod_inpl(&quo, &res->mpz, zlhs, zrhs);
                 mpz_deinit(&quo);
+		        // Check signs and do Python style modulo
+		        if (zlhs->neg != zrhs->neg) {
+                    mpz_add_inpl(&res->mpz, &res->mpz, zrhs);
+                }
                 break;
             }