Merge pull request adafruit#4804 from bergdahl/errormessages-ip

tannewt · web-flow · commit 533a84fe8009 · 2021-05-24T13:32:50.000-07:00
Removed 'raw' from error message 'raw int'
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -1672,6 +1672,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1693,10 +1697,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int or string supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""
diff --git a/shared-bindings/ipaddress/__init__.c b/shared-bindings/ipaddress/__init__.c
@@ -91,7 +91,7 @@ STATIC mp_obj_t ipaddress_ip_address(mp_obj_t ip_in) {
             mp_raise_ValueError(translate("Not a valid IP string"));
         }
     } else {
-        mp_raise_ValueError(translate("Only raw int or string supported for ip"));
+        mp_raise_ValueError(translate("Only int or string supported for ip"));
     }
 
     return common_hal_ipaddress_new_ipv4address(value);

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ STATIC mp_obj_t ipaddress_ip_address(mp_obj_t ip_in) {`
`91`	`91`	`mp_raise_ValueError(translate("Not a valid IP string"));`
`92`	`92`	`}`
`93`	`93`	`} else {`
`94`		`- mp_raise_ValueError(translate("Only raw int or string supported for ip"));`
	`94`	`+ mp_raise_ValueError(translate("Only int or string supported for ip"));`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`return common_hal_ipaddress_new_ipv4address(value);`