Regen auto-generated files

pwnlib/shellcraft/templates/aarch64/darwin/syscalls/execve.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>execve(path, argv, envp) -> str
 
@@ -54,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/aarch64/darwin/syscalls/exit.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>exit(status) -> str
 
@@ -52,8 +51,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/aarch64/darwin/syscalls/getdirentries64.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>getdirentries64(fd, buf, bufsize, position) -> str
 
@@ -55,8 +54,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/aarch64/darwin/syscalls/getxattr.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>getxattr(path, name, value, size) -> str
 
@@ -55,8 +54,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/aarch64/darwin/syscalls/lseek.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>lseek(fd, offset, whence) -> str
 
@@ -54,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/aarch64/darwin/syscalls/read.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>read(fd, buf, nbytes) -> str
 
@@ -54,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/aarch64/darwin/syscalls/write.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>write(fd, buf, n) -> str
 
@@ -54,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/amd64/darwin/syscalls/execve.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>execve(path, argv, envp) -> str
 
@@ -54,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/amd64/darwin/syscalls/exit.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>exit(status) -> str
 
@@ -52,8 +51,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/amd64/darwin/syscalls/getdirentries64.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>getdirentries64(fd, buf, bufsize, position) -> str
 
@@ -55,8 +54,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/amd64/darwin/syscalls/getxattr.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>getxattr(path, name, value, size) -> str
 
@@ -55,8 +54,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/amd64/darwin/syscalls/lseek.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>lseek(fd, offset, whence) -> str
 
@@ -54,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/amd64/darwin/syscalls/read.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>read(fd, buf, nbytes) -> str
 
@@ -54,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/amd64/darwin/syscalls/write.asm

@@ -3,7 +3,6 @@ import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>write(fd, buf, n) -> str
 
@@ -54,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/common/linux/syscalls/_llseek.asm

@@ -1,9 +1,9 @@
 <%
+# Auto-generated by pwnlib/data/syscalls/generate.py. DO NOT EDIT!
 import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>_llseek(vararg_0, vararg_1, vararg_2, vararg_3, vararg_4, vararg_5) -> str
 
@@ -52,8 +52,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, bytearray, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/common/linux/syscalls/_newselect.asm

@@ -1,9 +1,9 @@
 <%
+# Auto-generated by pwnlib/data/syscalls/generate.py. DO NOT EDIT!
 import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>_newselect(vararg_0, vararg_1, vararg_2, vararg_3, vararg_4, vararg_5) -> str
 
@@ -52,8 +52,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, bytearray, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/common/linux/syscalls/_sysctl.asm

@@ -1,9 +1,9 @@
 <%
+# Auto-generated by pwnlib/data/syscalls/generate.py. DO NOT EDIT!
 import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>_sysctl(vararg_0, vararg_1, vararg_2, vararg_3, vararg_4, vararg_5) -> str
 
@@ -52,8 +52,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, bytearray, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/common/linux/syscalls/accept.asm

@@ -1,9 +1,9 @@
 <%
+# Auto-generated by pwnlib/data/syscalls/generate.py. DO NOT EDIT!
 import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>accept(fd, addr, addr_len) -> str
 
@@ -54,8 +54,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, bytearray, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/common/linux/syscalls/accept4.asm

@@ -1,9 +1,9 @@
 <%
+# Auto-generated by pwnlib/data/syscalls/generate.py. DO NOT EDIT!
 import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>accept4(fd, addr, addr_len, flags) -> str
 
@@ -55,8 +55,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, bytearray, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg
 

pwnlib/shellcraft/templates/common/linux/syscalls/access.asm

@@ -1,9 +1,9 @@
 <%
+# Auto-generated by pwnlib/data/syscalls/generate.py. DO NOT EDIT!
 import collections
 import pwnlib.abi
 import pwnlib.constants
 import pwnlib.shellcraft
-import six
 %>
 <%docstring>access(name, type) -> str
 
@@ -53,8 +53,8 @@ Returns:
 
         # The argument is not a register.  It is a string value, and we
         # are expecting a string value
-        elif name in can_pushstr and isinstance(arg, (six.binary_type, six.text_type)):
-            if isinstance(arg, six.text_type):
+        elif name in can_pushstr and isinstance(arg, (bytes, bytearray, str)):
+            if isinstance(arg, str):
                 arg = arg.encode('utf-8')
             string_arguments[name] = arg