Initial merge of micropython v1.9.2 into circuitpython 2.0.0 (in development) master.

cpx build compiles and loads and works in repl; test suite not run yet
esp8266 not tested yet

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/netutils/netutils.c b/lib/netutils/netutils.c
index a2ea31cf3..15e70397c 100644
--- a/lib/netutils/netutils.c
+++ b/lib/netutils/netutils.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -31,6 +31,7 @@
 
 #include "py/obj.h"
 #include "py/nlr.h"
+#include "py/runtime.h"
 #include "lib/netutils/netutils.h"
 
 // Takes an array with a raw IPv4 address and returns something like '192.168.0.1'.
@@ -80,7 +81,7 @@ void netutils_parse_ipv4_addr(mp_obj_t addr_in, uint8_t *out_ip, netutils_endian
         } else if (i > 0 && s < s_top && *s == '.') {
             s++;
         } else {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid arguments"));
+            mp_raise_ValueError("invalid arguments");
         }
     }
 }