Compatibility with python 3.11 (Gallopsled#2070)

Arusekk · Arusekk · commit 020143f0f92b · 2022-12-28T21:46:26.000+01:00
Closes Gallopsled#2057 Closes Gallopsled#2052
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -12,8 +12,7 @@ pypandoc
 pyserial>=2.7
 requests>=2.5.1
 ropgadget>=5.3
-sphinx==1.8.6; python_version < '3.0.0'
-sphinx==4.5.0; python_version >= '3.0.0'
+sphinx==1.8.6; python_version<'3'
+sphinx>=4.5.0; python_version>='3'
 sphinx_rtd_theme
-sphinxcontrib-napoleon
-sphinxcontrib-autoprogram<=0.1.5
+sphinxcontrib-autoprogram<=0.1.5
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -42,8 +42,8 @@
     'sphinx.ext.coverage',
     'sphinx.ext.todo',
     'sphinx.ext.intersphinx',
+    'sphinx.ext.napoleon',
     'sphinxcontrib.autoprogram',
-    'sphinxcontrib.napoleon'
 ]
 
 # Disable "info" logging directly to stdout by Sphinx
diff --git a/pwnlib/util/safeeval.py b/pwnlib/util/safeeval.py
@@ -6,6 +6,7 @@
     'BUILD_CONST_KEY_MAP', 'BUILD_STRING',
     'LOAD_CONST','RETURN_VALUE','STORE_SUBSCR', 'STORE_MAP',
     'LIST_TO_TUPLE', 'LIST_EXTEND', 'SET_UPDATE', 'DICT_UPDATE', 'DICT_MERGE',
+    'COPY', 'RESUME',
     ]
 
 _expr_codes = _const_codes + [
@@ -15,6 +16,7 @@
     'BINARY_MODULO','BINARY_ADD','BINARY_SUBTRACT',
     'BINARY_LSHIFT','BINARY_RSHIFT','BINARY_AND','BINARY_XOR',
     'BINARY_OR',
+    'BINARY_OP',
     ]
 
 _values_codes = _expr_codes + ['LOAD_NAME']

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@`
`42`	`42`	`'sphinx.ext.coverage',`
`43`	`43`	`'sphinx.ext.todo',`
`44`	`44`	`'sphinx.ext.intersphinx',`
	`45`	`+ 'sphinx.ext.napoleon',`
`45`	`46`	`'sphinxcontrib.autoprogram',`
`46`		`- 'sphinxcontrib.napoleon'`
`47`	`47`	`]`
`48`	`48`
`49`	`49`	`# Disable "info" logging directly to stdout by Sphinx`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`'BUILD_CONST_KEY_MAP', 'BUILD_STRING',`
`7`	`7`	`'LOAD_CONST','RETURN_VALUE','STORE_SUBSCR', 'STORE_MAP',`
`8`	`8`	`'LIST_TO_TUPLE', 'LIST_EXTEND', 'SET_UPDATE', 'DICT_UPDATE', 'DICT_MERGE',`
	`9`	`+ 'COPY', 'RESUME',`
`9`	`10`	`]`
`10`	`11`
`11`	`12`	`_expr_codes = _const_codes + [`
`@@ -15,6 +16,7 @@`
`15`	`16`	`'BINARY_MODULO','BINARY_ADD','BINARY_SUBTRACT',`
`16`	`17`	`'BINARY_LSHIFT','BINARY_RSHIFT','BINARY_AND','BINARY_XOR',`
`17`	`18`	`'BINARY_OR',`
	`19`	`+ 'BINARY_OP',`
`18`	`20`	`]`
`19`	`21`
`20`	`22`	`_values_codes = _expr_codes + ['LOAD_NAME']`