Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'origin/master'

  • Loading branch information...
commit c5134150b7a5f71b631df6290c1508da53873c46 2 parents d40159b + 521c25e
@vic authored
View
5 lib/typhon/environment/module.rb
@@ -17,10 +17,7 @@ module Environment
s.py_set(:__name__, name)
s.py_set(:__doc__, doc)
s.py_set(:__file__, filename)
- end
-
- def py_module_from
- return self
+ s.py_from_module = s
end
end
View
6 lib/typhon/environment/python_object.rb
@@ -28,7 +28,7 @@ def py_data_descriptor; false; end
attr_reader :py_type
attr_reader :py_attributes
- attr_reader :py_from_module
+ attr_accessor :py_from_module
# this is a hash that applies *only* to this
# object, with no inheritance rules applied.
@@ -146,7 +146,7 @@ def py_del(name)
def py_send(method, *args)
py_get(method).invoke(*args)
end
-
+
def py_instance_string()
"<#{@py_type && @py_type.module && @py_type.module.py_get(:__name__) || '?'}.#{@py_type && @py_type.name || '?'} object at 0x#{object_id.to_s(16)}>"
end
@@ -192,7 +192,7 @@ def inspect()
alias :to_s :inspect
alias :to_str :inspect
-
+
def to_py
return self
end
Please sign in to comment.
Something went wrong with that request. Please try again.