From 1abf257a977f1b56caeda28129d43c03fced998a Mon Sep 17 00:00:00 2001
From: chenniannian <chenniannian@xiaoduotech.com>
Date: Fri, 18 Oct 2019 19:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dpython3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beanstalkc.py | 18 ++++++++++++++++--
 setup.py      |  3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/beanstalkc.py b/beanstalkc.py
index d9d2013..50fc234 100755
--- a/beanstalkc.py
+++ b/beanstalkc.py
@@ -5,6 +5,8 @@
 import socket
 import sys
 
+__python_version__ = sys.version_info.major
+
 
 __license__ = '''
 Copyright (C) 2008-2016 Andreas Bolka
@@ -47,12 +49,20 @@ def wrap(wrapped_function, *args, **kwargs):
             raise SocketError(err)
 
 
+def to_str(data):
+    return data if isinstance(data, str) else data.decode()
+
+
+def to_bytes(data):
+    return data if isinstance(data, bytes) else data.encode()
+
+
 class Connection(object):
     def __init__(self, host=DEFAULT_HOST, port=DEFAULT_PORT, parse_yaml=True,
                  connect_timeout=socket.getdefaulttimeout()):
         if parse_yaml is True:
             try:
-                parse_yaml = __import__('yaml').load
+                parse_yaml = __import__('yaml').full_load
             except ImportError:
                 logging.error('Failed to load PyYAML, will not parse YAML')
                 parse_yaml = False
@@ -93,6 +103,8 @@ def reconnect(self):
         self.connect()
 
     def _interact(self, command, expected_ok, expected_err=[]):
+
+        command = to_bytes(command) if __python_version__ == 3 else to_str(command)
         SocketError.wrap(self._socket.sendall, command)
         status, results = self._read_response()
         if status in expected_ok:
@@ -106,6 +118,8 @@ def _read_response(self):
         line = SocketError.wrap(self._socket_file.readline)
         if not line:
             raise SocketError()
+
+        line = to_str(line)
         response = line.split()
         return response[0], response[1:]
 
@@ -114,7 +128,7 @@ def _read_body(self, size):
         SocketError.wrap(self._socket_file.read, 2)  # trailing crlf
         if size > 0 and not body:
             raise SocketError()
-        return body
+        return to_str(body)
 
     def _interact_value(self, command, expected_ok, expected_err=[]):
         return self._interact(command, expected_ok, expected_err)[0]
diff --git a/setup.py b/setup.py
index 5e4a8d1..803f037 100755
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,9 @@
 ''',
     url='http://github.com/earl/beanstalkc',
     license='Apache License, Version 2.0',
+    install_requires=[
+          "PyYAML==5.1.2"
+    ],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',