cleanup patches, make them better readable, add deprecation and merge…

… gruf_support in pas to reduce complexicty
plone · Mar 11, 2015 · 6f34326 · 6f34326
1 parent bb791b9
commit 6f34326
Show file tree

Hide file tree

Showing 6 changed files with 410 additions and 256 deletions.
diff --git a/Products/PlonePAS/__init__.py b/Products/PlonePAS/__init__.py
@@ -30,11 +30,6 @@
 else:
     from Products.PlonePAS import  ldapmp
 
-#################################
-# pas monkies 2 play w/ gruf
-if config.PAS_INSIDE_GRUF:
-    from Products.PlonePAS import gruf_support
-
 
 ####################################
 # monkey patch pas, the evil happens

diff --git a/Products/PlonePAS/config.py b/Products/PlonePAS/config.py
@@ -2,7 +2,7 @@
 PROJECTNAME = 'PlonePAS'
 GLOBALS = globals()
 
-PAS_INSIDE_GRUF = True
+PAS_INSIDE_GRUF = False
 
 DEFAULT_CHALLENGE_PROTOCOL = ['http']
 DEFAULT_PROTO_MAPPING = {

diff --git a/Products/PlonePAS/gruf_support.py b/Products/PlonePAS/gruf_support.py