Switch to pyo3 master for now, update enums

bindings/python/Cargo.toml

@@ -17,7 +17,7 @@ extension-module = ["pyo3/extension-module"]
 
 [dependencies]
 accesskit = { version = "0.11.2", path = "../../common", features = ["pyo3"] }
-pyo3 = { version = "0.19", features = ["abi3-py37", "multiple-pymethods"] }
+pyo3 = { git = "https://github.com/PyO3/pyo3.git", features = ["abi3-py37", "multiple-pymethods"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 accesskit_windows = { version = "0.14.3", path = "../../platforms/windows" }

bindings/python/examples/pygame/hello_world.py

@@ -25,18 +25,18 @@
 
 
 def build_button(id, name, classes):
-    builder = accesskit.NodeBuilder(accesskit.Role.Button)
+    builder = accesskit.NodeBuilder(accesskit.Role.BUTTON)
     builder.set_bounds(BUTTON_1_RECT if id == BUTTON_1_ID else BUTTON_2_RECT)
     builder.set_name(name)
-    builder.add_action(accesskit.Action.Focus)
-    builder.set_default_action_verb(accesskit.DefaultActionVerb.Click)
+    builder.add_action(accesskit.Action.FOCUS)
+    builder.set_default_action_verb(accesskit.DefaultActionVerb.CLICK)
     return builder.build(classes)
 
 
 def build_announcement(text, classes):
-    builder = accesskit.NodeBuilder(accesskit.Role.StaticText)
+    builder = accesskit.NodeBuilder(accesskit.Role.STATIC_TEXT)
     builder.set_name(text)
-    builder.set_live(accesskit.Live.Polite)
+    builder.set_live(accesskit.Live.POLITE)
     return builder.build(classes)
 
 
@@ -85,7 +85,7 @@ def focus(self):
         return self._focus if self.is_window_focused else None
 
     def build_root(self):
-        builder = accesskit.NodeBuilder(accesskit.Role.Window)
+        builder = accesskit.NodeBuilder(accesskit.Role.WINDOW)
         builder.set_children([BUTTON_1_ID, BUTTON_2_ID])
         if not self.announcement is None:
             builder.push_child(ANNOUNCEMENT_ID)
@@ -136,10 +136,10 @@ def build_tree_update_for_focus_update(self):
 
 
 def do_action(request):
-    if request.action in [accesskit.Action.Default, accesskit.Action.Focus]:
+    if request.action in [accesskit.Action.DEFAULT, accesskit.Action.FOCUS]:
         args = {
             "event": SET_FOCUS_MSG
-            if request.action == accesskit.Action.Focus
+            if request.action == accesskit.Action.FOCUS
             else DO_DEFAULT_ACTION_MSG,
             "target": request.target,
         }

common/Cargo.toml

@@ -15,7 +15,7 @@ features = ["schemars", "serde"]
 
 [dependencies]
 enumn = { version = "0.1.6", optional = true }
-pyo3 = { version = "0.19", optional = true }
+pyo3 = { git = "https://github.com/PyO3/pyo3.git", optional = true }
 schemars = { version = "0.8.7", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }