@@ -35,11 +35,11 @@ class DeadlineSoon(BeanstalkcException): pass class Connection(object): - def __init__(self, host=DEFAULT_HOST, port=DEFAULT_PORT, decode_yaml=True): - if decode_yaml: - self.yaml_load = __import__('yaml').load + def __init__(self, host=DEFAULT_HOST, port=DEFAULT_PORT, parse_yaml=True): + if parse_yaml: + self.parse_yaml = __import__('yaml').load else: - self.yaml_load = lambda x: x + self.parse_yaml = lambda x: x self.host = host self.port = port self.connect() @@ -82,7 +82,7 @@ class Connection(object): def _interact_yaml(self, command, expected_ok, expected_err=[]): size, = self._interact(command, expected_ok, expected_err) body = self._read_body(int(size)) - return self.yaml_load(body) + return self.parse_yaml(body) def _interact_peek(self, command): try: beanstalkc.py ac7c037e9486e7381abbb7901972673109365392 Andreas Bolka a@bolka.at http://github.com/earl/beanstalkc/commit/6e282a050ee1d0697fc9ebe89a6e1ab51b5171c9 6e282a050ee1d0697fc9ebe89a6e1ab51b5171c9 2009-11-08T17:08:37-08:00 2009-11-08T09:00:57-08:00 Change YAML-related names for clarity b0f99f1a084e46bb136e69c862d7c0112bc327ed Andreas Bolka a@bolka.at