[Repoze-checkins] r1075 - in repoze.zope2/trunk/repoze/zope2: . tests

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Wed Jun 11 21:40:32 2008
New Revision: 1075

Log:
Remove unused code.


Modified:
   repoze.zope2/trunk/repoze/zope2/tests/test_z2bob.py
   repoze.zope2/trunk/repoze/zope2/z2bob.py

Modified: repoze.zope2/trunk/repoze/zope2/tests/test_z2bob.py
==============================================================================
--- repoze.zope2/trunk/repoze/zope2/tests/test_z2bob.py	(original)
+++ repoze.zope2/trunk/repoze/zope2/tests/test_z2bob.py	Wed Jun 11 21:40:32 2008
@@ -95,29 +95,6 @@
         from repoze.zope2.z2bob import cleanPath
         self.assertEqual(cleanPath('foo/../bar'), ['bar'])
 
-    def test_parent_acquired__not_acquired(self):
-        from Acquisition import Implicit
-        class Dummy(Implicit):
-            pass
-        parent = Dummy()
-        a = Dummy()
-        a = a.__of__(parent)
-        from repoze.zope2.z2bob import parent_acquired
-        self.failIf(parent_acquired(a), a.aq_parent)
-
-    def test_parent_acquired__acquired(self):
-        from Acquisition import Implicit
-        class Dummy(Implicit):
-            pass
-        root = Dummy()
-        parent = Dummy().__of__(root)
-        uncle = Dummy().__of__(root)
-        a = Dummy()
-        a = a.__of__(uncle) # aq_inner
-        a = a.__of__(parent) # not aq_inner
-        from repoze.zope2.z2bob import parent_acquired
-        self.failUnless(parent_acquired(a), a.aq_parent)
-
 class TestZope2ObobHelper(unittest.TestCase, PlacelessSetup):
     def setUp(self):
         PlacelessSetup.setUp(self)
@@ -150,7 +127,6 @@
         self.assertEqual(helper.environ, environ)
         self.assertEqual(helper.encoding, 'utf-8')
         self.assertEqual(helper.zopeconf, None)
-        self.assertEqual(helper.realm, 'Zope')
         self.assertEqual(helper.appname, 'Application')
         self.assertEqual(helper.browser_default_redirects, False)
 

Modified: repoze.zope2/trunk/repoze/zope2/z2bob.py
==============================================================================
--- repoze.zope2/trunk/repoze/zope2/z2bob.py	(original)
+++ repoze.zope2/trunk/repoze/zope2/z2bob.py	Wed Jun 11 21:40:32 2008
@@ -66,9 +66,6 @@
 from AccessControl.SecurityManagement import noSecurityManager
 from AccessControl import Unauthorized as AccessControl_Unauthorized
 
-from Acquisition import aq_parent
-from Acquisition import aq_inner
-
 # we still import these because they're compared using 'is' outside ZPublisher
 from ZPublisher.BaseRequest import RequestContainer
 from ZPublisher.BaseRequest import UNSPECIFIED_ROLES
@@ -126,10 +123,6 @@
         if result is not None:
             return result
 
-def parent_acquired(obj):
-    # return True if obj's aq_parent is not his containment parent
-    return aq_parent(obj) is not aq_parent(aq_inner(obj))
-
 base_re_search=re.compile('(<base.*?>)',re.I).search
 start_of_header_search = re.compile('(<head[^>]*>)', re.IGNORECASE).search
 
@@ -160,7 +153,6 @@
         self._config = config
         self.encoding = config.get('encoding', 'utf-8')
         self.zopeconf = config['zope.conf']
-        self.realm = config.get('realm', 'Zope')
         self.appname = config.get('appname', 'Application')
         self.browser_default_redirects = asbool(config.get(
             'browser_default_redirects', False))
@@ -692,10 +684,3 @@
 
     return root
 
-def vhmtest(app, global_conf):
-    def test(environ, start_response):
-        environ['HTTP_X_VHM_HOST'] = 'http://127.0.0.1:8080'
-        environ['HTTP_X_VHM_ROOT'] = '/siteroot'
-        return app(environ, start_response)
-    return test
-