remove decoy PHASE3_CONFIG phase (its the default)

7 files changed, 10 insertions, 17 deletions

diff --git a/pyramid/config/adapters.py b/pyramid/config/adapters.py
index 6c6ca92b7..f022e7f08 100644
--- a/pyramid/config/adapters.py
+++ b/pyramid/config/adapters.py
@@ -1,7 +1,6 @@
 from zope.interface import Interface
 
 from pyramid.interfaces import IResponse
-from pyramid.interfaces import PHASE3_CONFIG
 
 from pyramid.config.util import action_method
 
@@ -28,7 +27,7 @@ class AdaptersConfiguratorMixin(object):
             iface = (iface,)
         def register():
             self.registry.registerHandler(subscriber, iface)
-        self.action(None, register, order=PHASE3_CONFIG)
+        self.action(None, register)
         return subscriber
 
     @action_method
@@ -53,7 +52,7 @@ class AdaptersConfiguratorMixin(object):
                 reg.registerSelfAdapter((type_or_iface,), IResponse)
             else:
                 reg.registerAdapter(adapter, (type_or_iface,), IResponse)
-        self.action((IResponse, type_or_iface), register, order=PHASE3_CONFIG)
+        self.action((IResponse, type_or_iface), register)
 
     def _register_response_adapters(self):
         # cope with WebOb response objects that aren't decorated with IResponse
diff --git a/pyramid/config/factories.py b/pyramid/config/factories.py
index bf3e0f5cd..4b3fa5a9d 100644
--- a/pyramid/config/factories.py
+++ b/pyramid/config/factories.py
@@ -4,7 +4,6 @@ from pyramid.interfaces import IDefaultRootFactory
 from pyramid.interfaces import IRequestFactory
 from pyramid.interfaces import IRootFactory
 from pyramid.interfaces import ISessionFactory
-from pyramid.interfaces import PHASE3_CONFIG
 
 from pyramid.traversal import DefaultRootFactory
 
@@ -25,7 +24,7 @@ class FactoriesConfiguratorMixin(object):
         def register():
             self.registry.registerUtility(factory, IRootFactory)
             self.registry.registerUtility(factory, IDefaultRootFactory) # b/c
-        self.action(IRootFactory, register, order=PHASE3_CONFIG)
+        self.action(IRootFactory, register)
 
     _set_root_factory = set_root_factory # bw compat
 
@@ -43,7 +42,7 @@ class FactoriesConfiguratorMixin(object):
         session_factory = self.maybe_dotted(session_factory)
         def register():
             self.registry.registerUtility(session_factory, ISessionFactory)
-        self.action(ISessionFactory, register, order=PHASE3_CONFIG)
+        self.action(ISessionFactory, register)
 
     @action_method
     def set_request_factory(self, factory):
@@ -62,5 +61,5 @@ class FactoriesConfiguratorMixin(object):
         factory = self.maybe_dotted(factory)
         def register():
             self.registry.registerUtility(factory, IRequestFactory)
-        self.action(IRequestFactory, register, order=PHASE3_CONFIG)
+        self.action(IRequestFactory, register)
 
diff --git a/pyramid/config/rendering.py b/pyramid/config/rendering.py
index deb1404e7..cba6090b5 100644
--- a/pyramid/config/rendering.py
+++ b/pyramid/config/rendering.py
@@ -3,7 +3,6 @@ import warnings
 from pyramid.interfaces import IRendererFactory
 from pyramid.interfaces import IRendererGlobalsFactory
 from pyramid.interfaces import PHASE1_CONFIG
-from pyramid.interfaces import PHASE3_CONFIG
 
 from pyramid.config.util import action_method
 
@@ -89,4 +88,4 @@ class RenderingConfiguratorMixin(object):
         factory = self.maybe_dotted(factory)
         def register():
             self.registry.registerUtility(factory, IRendererGlobalsFactory)
-        self.action(IRendererGlobalsFactory, register, order=PHASE3_CONFIG)
+        self.action(IRendererGlobalsFactory, register)
diff --git a/pyramid/config/security.py b/pyramid/config/security.py
index bdf9be5e6..31bf74e7c 100644
--- a/pyramid/config/security.py
+++ b/pyramid/config/security.py
@@ -3,7 +3,6 @@ from pyramid.interfaces import IAuthenticationPolicy
 from pyramid.interfaces import IDefaultPermission
 from pyramid.interfaces import PHASE1_CONFIG
 from pyramid.interfaces import PHASE2_CONFIG
-from pyramid.interfaces import PHASE3_CONFIG
 
 from pyramid.exceptions import ConfigurationError
 from pyramid.config.util import action_method
@@ -60,7 +59,7 @@ class SecurityConfiguratorMixin(object):
         # authorization policy used by view config (phase 3) and
         # authentication policy (phase 2)
         self.action(IAuthorizationPolicy, register, order=PHASE1_CONFIG)
-        self.action(None, ensure, order=PHASE3_CONFIG)
+        self.action(None, ensure)
 
     def _set_authorization_policy(self, policy):
         policy = self.maybe_dotted(policy)
diff --git a/pyramid/config/tweens.py b/pyramid/config/tweens.py
index bf127b5df..2704b89c1 100644
--- a/pyramid/config/tweens.py
+++ b/pyramid/config/tweens.py
@@ -1,7 +1,6 @@
 from zope.interface import implements
 
 from pyramid.interfaces import ITweens
-from pyramid.interfaces import PHASE3_CONFIG
 
 from pyramid.exceptions import ConfigurationError
 from pyramid.tweens import excview_tween_factory
@@ -142,7 +141,7 @@ class TweensConfiguratorMixin(object):
             else:
                 tweens.add_implicit(name, tween_factory, under=under, over=over)
 
-        self.action(('tween', name, explicit), register, order=PHASE3_CONFIG)
+        self.action(('tween', name, explicit), register)
 
 class CyclicDependencyError(Exception):
     def __init__(self, cycles):
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 5fb586f8a..078408914 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -26,7 +26,6 @@ from pyramid.interfaces import IViewClassifier
 from pyramid.interfaces import IViewMapper
 from pyramid.interfaces import IViewMapperFactory
 from pyramid.interfaces import PHASE1_CONFIG
-from pyramid.interfaces import PHASE3_CONFIG
 
 from pyramid import renderers
 from pyramid.exceptions import ConfigurationError
@@ -1061,7 +1060,7 @@ class ViewsConfiguratorMixin(object):
             xhr, accept, header, path_info, match_param]
         discriminator.extend(sorted(custom_predicates))
         discriminator = tuple(discriminator)
-        self.action(discriminator, register, order=PHASE3_CONFIG)
+        self.action(discriminator, register)
     
     def derive_view(self, view, attr=None, renderer=None):
         """
diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py
index 408135711..775c571cf 100644
--- a/pyramid/interfaces.py
+++ b/pyramid/interfaces.py
@@ -851,8 +851,7 @@ class IRendererInfo(Interface):
 
 # configuration phases: a lower phase number means the actions associated
 # with this phase will be executed earlier than those with later phase
-# numbers
+# numbers.  The default phase number is 0, FTR.
 
 PHASE1_CONFIG = -20
 PHASE2_CONFIG = -10
-PHASE3_CONFIG = 0