CanSee should pass the observer, like, for real.

glyph · Jun 6, 2014 · 597f6a6 · 597f6a6
1 parent ceca85c
commit 597f6a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/imaginary/action.py b/imaginary/action.py
@@ -310,7 +310,7 @@ def _getIt(player, thingName, iface, radius):
     @return: An iterable of L{iimaginary.IThing} providers which are found.
     """
     providerOf = ProviderOf(iface)
-    canSee = CanSee(providerOf)
+    canSee = CanSee(providerOf, player)
     named = Named(thingName, canSee, player)
     reachable = Reachable(named)
     proximity = Proximity(radius, reachable)

diff --git a/imaginary/garments.py b/imaginary/garments.py
@@ -6,7 +6,7 @@
 
 """
 
-from zope.interface import implements
+from zope.interface import implements, implementer
 
 from axiom import item, attributes
 
@@ -296,6 +296,7 @@ def annotationsFor(self, link, idea):
 
 
 
+@implementer(iimaginary.IElectromagneticMedium)
 class _WornBy(object):
     """
     This is an annotation, produced by L{Wearer} for containment relationships
@@ -304,8 +305,6 @@ class _WornBy(object):
     its own way and therefor shouldn't show up in the list of a person's
     contents.
     """
-    implements(iimaginary.IElectromagneticMedium)
-
 
     def __init__(self, wearer):
         """

diff --git a/imaginary/iimaginary.py b/imaginary/iimaginary.py
@@ -732,6 +732,7 @@ def isOpaque(observer):
         @param observer: The L{Thing} which has eyeballs which are shooting out
             electromagnetic radiation which could lead to reflected perceptrons
             to let the L{Thing} perceive a target.
+        @type observer: L{Thing}
 
         @note: This interface has a problem.  C{observer} should probably
             provide some kind of C{ISpectrum} interface and the implementation