From c15fe7a1298be06fcb25c1377c8ae18f98bce1ff Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Tue, 20 Oct 2015 22:43:23 -0600
Subject: Weighs more than, or less than, is really confusing...

So we adopt over/under from tweens. Now it becomes simple to
think/reason about stuff again =)
---
 pyramid/config/views.py                       | 14 +++++++-------
 pyramid/tests/test_config/test_derivations.py |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index ee35ae217..0d6f3c43f 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1077,8 +1077,8 @@ class ViewsConfiguratorMixin(object):
 
     @action_method
     def add_view_derivation(self, name, factory, default, 
-                            weighs_more_than=None,
-                            weighs_less_than=None):
+                            under=None,
+                            over=None):
         factory = self.maybe_dotted(factory)
         discriminator = ('view option', name)
         intr = self.introspectable(
@@ -1088,16 +1088,16 @@ class ViewsConfiguratorMixin(object):
             '%s derivation' % type)
         intr['name'] = name
         intr['factory'] = factory
-        intr['weighs_more_than'] = weighs_more_than
-        intr['weighs_less_than'] = weighs_less_than
+        intr['under'] = under
+        intr['over'] = over
         def register():
             derivers = self.registry.queryUtility(IViewDerivers)
             if derivers is None:
                 derivers = TopologicalSorter()
                 self.registry.registerUtility(derivers, IViewDerivers)
             derivers.add(name, (factory, default),
-                         after=weighs_more_than,
-                         before=weighs_less_than)
+                         after=under,
+                         before=over)
         self.action(discriminator, register, introspectables=(intr,),
                     order=PHASE1_CONFIG) # must be registered early
 
@@ -1112,7 +1112,7 @@ class ViewsConfiguratorMixin(object):
         ]
         after = pyramid.util.FIRST
         for name, deriver in derivers:
-            self.add_view_derivation(name, deriver, default=None, weighs_more_than=after)
+            self.add_view_derivation(name, deriver, default=None, under=after)
             after = name
 
     def derive_view(self, view, attr=None, renderer=None):
diff --git a/pyramid/tests/test_config/test_derivations.py b/pyramid/tests/test_config/test_derivations.py
index 277aad662..94f570fe2 100644
--- a/pyramid/tests/test_config/test_derivations.py
+++ b/pyramid/tests/test_config/test_derivations.py
@@ -1191,8 +1191,8 @@ class TestAddDerivation(unittest.TestCase):
             return view
 
         self.config.add_view_derivation('deriv1', deriv1, default=None)
-        self.config.add_view_derivation('deriv2', deriv2, default=None, weighs_less_than='deriv1')
-        self.config.add_view_derivation('deriv3', deriv3, default=None, weighs_more_than='deriv2')
+        self.config.add_view_derivation('deriv2', deriv2, default=None, over='deriv1')
+        self.config.add_view_derivation('deriv3', deriv3, default=None, under='deriv2')
         result = self.config._derive_view(view)
         self.assertEqual(response.deriv, ['deriv2', 'deriv3', 'deriv1'])
 
-- 
cgit v1.2.3