Merge pull request #1711 from minrk/event-constants

EVENT_HANDSHAKE constants shouldn't have EVENT_ prefix stripped

Author: minrk

.github/workflows/test.yml

@@ -35,7 +35,7 @@ jobs:
             zmq: bundled
 
           - os: macos-10.15
-            python: pypy3
+            python: pypy-3.8
             zmq: bundled
 
           - os: ubuntu-18.04
@@ -44,11 +44,11 @@ jobs:
             tornado: none
 
           - os: ubuntu-20.04
-            python: pypy3
+            python: pypy-3.8
             zmq: bundled
 
           - os: ubuntu-20.04
-            python: pypy3
+            python: pypy-3.7
 
           - os: ubuntu-20.04
             python: 3.7
@@ -62,7 +62,7 @@ jobs:
             python: "3.10"
 
           - os: ubuntu-20.04
-            python: "3.11.0-beta.1"
+            python: "3.11.0-beta.3"
 
           - os: ubuntu-20.04
             python: 3.8
@@ -81,10 +81,10 @@ jobs:
             arch: x64
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch || 'x64' }}
@@ -127,7 +127,7 @@ jobs:
 
       # preserve pip cache to speed up installation
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           # Look to see if there is a cache hit for the corresponding requirements file

.github/workflows/wheels.yml

@@ -24,10 +24,10 @@ jobs:
   check-bundle:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.8"
 
@@ -38,10 +38,10 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.8"
 
@@ -56,7 +56,7 @@ jobs:
           python setup.py cython
           python -m build --sdist .
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: sdist
           path: "dist/*.tar.gz"
@@ -209,10 +209,10 @@ jobs:
               build: "cp*win_amd64"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.8"
           architecture: ${{ matrix.architecture }}
@@ -275,7 +275,7 @@ jobs:
         run: |
           python -m cibuildwheel .
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: wheels-${{ matrix.name }}
           path: "wheelhouse/*"

zmq/constants.py

@@ -301,7 +301,7 @@ class Event(IntFlag):
 
     @staticmethod
     def _global_name(name):
-        if name.startswith(("PROTOCOL_ERROR_", "HANDSHAKE_")):
+        if name.startswith("PROTOCOL_ERROR_"):
             return name
         else:
             # add EVENT_ prefix
@@ -430,10 +430,10 @@ class DeviceType(IntEnum):
 EVENT_DISCONNECTED: int = Event.DISCONNECTED
 EVENT_MONITOR_STOPPED: int = Event.MONITOR_STOPPED
 EVENT_ALL: int = Event.ALL
-HANDSHAKE_FAILED_NO_DETAIL: int = Event.HANDSHAKE_FAILED_NO_DETAIL
-HANDSHAKE_SUCCEEDED: int = Event.HANDSHAKE_SUCCEEDED
-HANDSHAKE_FAILED_PROTOCOL: int = Event.HANDSHAKE_FAILED_PROTOCOL
-HANDSHAKE_FAILED_AUTH: int = Event.HANDSHAKE_FAILED_AUTH
+EVENT_HANDSHAKE_FAILED_NO_DETAIL: int = Event.HANDSHAKE_FAILED_NO_DETAIL
+EVENT_HANDSHAKE_SUCCEEDED: int = Event.HANDSHAKE_SUCCEEDED
+EVENT_HANDSHAKE_FAILED_PROTOCOL: int = Event.HANDSHAKE_FAILED_PROTOCOL
+EVENT_HANDSHAKE_FAILED_AUTH: int = Event.HANDSHAKE_FAILED_AUTH
 PROTOCOL_ERROR_ZMTP_UNSPECIFIED: int = Event.PROTOCOL_ERROR_ZMTP_UNSPECIFIED
 PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND: int = (
     Event.PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND
@@ -679,10 +679,10 @@ class DeviceType(IntEnum):
     "EVENT_DISCONNECTED",
     "EVENT_MONITOR_STOPPED",
     "EVENT_ALL",
-    "HANDSHAKE_FAILED_NO_DETAIL",
-    "HANDSHAKE_SUCCEEDED",
-    "HANDSHAKE_FAILED_PROTOCOL",
-    "HANDSHAKE_FAILED_AUTH",
+    "EVENT_HANDSHAKE_FAILED_NO_DETAIL",
+    "EVENT_HANDSHAKE_SUCCEEDED",
+    "EVENT_HANDSHAKE_FAILED_PROTOCOL",
+    "EVENT_HANDSHAKE_FAILED_AUTH",
     "PROTOCOL_ERROR_ZMTP_UNSPECIFIED",
     "PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND",
     "PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE",