Skip to content
Permalink
Browse files

Merge pull request #714 from kostya/hash_fetch

fix Hash#fetch
  • Loading branch information
alex committed May 19, 2013
2 parents 6b7a659 + a57647a commit 56de238d5b7bba5d109279ebb35866683a1354e9
Showing with 4 additions and 6 deletions.
  1. +0 −2 spec/tags/core/hash/fetch_tags.txt
  2. +3 −3 topaz/objects/hashobject.py
  3. +1 −1 topaz/objspace.py

This file was deleted.

@@ -74,10 +74,10 @@ def method_fetch(self, space, w_key, w_value=None, block=None):
try:
return self.contents[w_key]
except KeyError:
if w_value is not None:
return w_value
elif block is not None:
if block is not None:
return space.invoke_block(block, [w_key])
elif w_value is not None:
return w_value
else:
raise space.error(space.w_KeyError, "key not found: %s" % space.send(w_key, "inspect"))

@@ -164,7 +164,7 @@ def __init__(self, config):
self.w_NameError, self.w_StandardError, self.w_LocalJumpError,
self.w_IndexError, self.w_IOError, self.w_NotImplementedError,
self.w_EOFError, self.w_FloatDomainError, self.w_FiberError,
self.w_SystemStackError,
self.w_SystemStackError, self.w_KeyError,

self.w_kernel, self.w_topaz,

0 comments on commit 56de238

Please sign in to comment.
You can’t perform that action at this time.