Fix warning that bytes != string (#1893)

* Fix warning that bytes != string * Update CHANGELOG
Gallopsled · May 17, 2021 · 29fd2fe · 29fd2fe
1 parent 3c85afd
commit 29fd2fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,12 +64,14 @@ The table below shows which release corresponds to each branch, and what date th
 - [#1733][1733] Update libc headers -> more syscalls available!
 - [#1876][1876] add `self.message` and change `sys.exc_type` to `sys.exec_info()` in PwnlibException
 - [#1877][1877] encoders error message handles when `avoid` is bytes in python3
-- [#1892](1892) Silence SIGPIPE error for "pwn phd"
+- [#1892][1892] Silence SIGPIPE error for "pwn phd"
+- [#1893][1893] Fix bytes warning in "pwn cyclic"
 
 [1733]: https://github.com/Gallopsled/pwntools/pull/1733
 [1876]: https://github.com/Gallopsled/pwntools/pull/1876
 [1877]: https://github.com/Gallopsled/pwntools/pull/1877
 [1892]: https://github.com/Gallopsled/pwntools/pull/1892
+[1893]: https://github.com/Gallopsled/pwntools/pull/1893
 
 ## 4.6.0 (`beta`)
 

diff --git a/pwnlib/commandline/cyclic.py b/pwnlib/commandline/cyclic.py
@@ -67,6 +67,9 @@ def main(args):
     if args.lookup:
         pat = args.lookup
 
+        if six.PY3:
+            pat = bytes(pat, encoding='utf-8')
+
         try:
             pat = int(pat, 0)
         except ValueError: