Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix exception types raised from __getattr__ or __getattribute__ #71

Closed
wants to merge 3 commits into from
Closed

Fix exception types raised from __getattr__ or __getattribute__ #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
188b123
Fixed an uninitialised variable.
Mar 9, 2011
8cfed70
Merge remote branch 'upstream/master'
Mar 22, 2012
d830836
Make RPyC more introspection friendly.
Mar 22, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions rpyc/core/stream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,14 @@ def write(self, data):
"""
raise NotImplementedError()


class EOF_and_AttributeError(EOFError, AttributeError):
pass

class ClosedFile(object):
"""Represents a closed file object (singleton)"""
__slots__ = ()
def __getattr__(self, name):
raise EOFError("stream has been closed")
raise EOF_and_AttributeError("stream has been closed")
def close(self):
pass
@property
Expand Down
2 changes: 1 addition & 1 deletion rpyc/lib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class MissingModule(object):
def __init__(self, name):
self.__name = name
def __getattr__(self, name):
raise ImportError("module %r not found" % (self.__name,))
raise AttributeError("module %r not found" % (self.__name,))
def __bool__(self):
return False
__nonzero__ = __bool__
Expand Down