Remove unused local assignment

Add test for upward traversal

doc/CHANGES.txt

@@ -121,6 +121,9 @@ Zope Changes
        is now installed into the 'bin' folder.
 
     Bugs fixed
+    
+     - unrestrictedTraverse() refactored to remove hasattr calls (which mask
+       conflict errors) and for greater readability and maintainability.
 
      - Zope can now be embedded in C/C++ without exceptions being raised
        in zdoptions.

lib/python/OFS/Traversable.py

@@ -127,7 +127,6 @@ class Traversable:
             return self
         
         _getattr = getattr
-        _hasattr = hasattr
         _none = None
         marker = _marker
 

lib/python/OFS/tests/testTraverse.py

@@ -255,6 +255,12 @@ class TestTraverse( unittest.TestCase ):
         SecurityManager.setSecurityPolicy( self.oldPolicy )
         self.assertEqual(
             self.root.restrictedTraverse('happy/happy', 'joy'), 'joy')
+            
+    def testTraverseUp(self):
+        # Test that we can traverse upwards
+        self.failUnless(
+            aq_base(self.root.folder1.file.restrictedTraverse('../..')) is
+            aq_base(self.root))
 
 
 def test_suite():