From a222cef0a10a5517349f05cea0e382b35e3a14a6 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 13 Feb 2013 14:11:34 +0100
Subject: [PATCH] filenames without _ (spare my pinkie)
---
auth/{manifold_backend.py => manifoldbackend.py} | 3 +--
engine/{manifold_api.py => manifoldapi.py} | 8 +++++---
engine/{manifold_query.py => manifoldquery.py} | 3 ---
engine/plugin.py | 4 ++--
engine/static/css/plugin.css | 6 ++++++
myslice/config.py | 4 ++--
myslice/settings.py | 2 +-
myslice/viewutils.py | 2 +-
8 files changed, 18 insertions(+), 14 deletions(-)
rename auth/{manifold_backend.py => manifoldbackend.py} (96%)
rename engine/{manifold_api.py => manifoldapi.py} (78%)
rename engine/{manifold_query.py => manifoldquery.py} (99%)
diff --git a/auth/manifold_backend.py b/auth/manifoldbackend.py
similarity index 96%
rename from auth/manifold_backend.py
rename to auth/manifoldbackend.py
index 67ab89f4..f548b434 100644
--- a/auth/manifold_backend.py
+++ b/auth/manifoldbackend.py
@@ -1,6 +1,6 @@
# import the User object
from django.contrib.auth.models import User
-from engine.manifold_api import ManifoldAPI
+from engine.manifoldapi import ManifoldAPI
# import time - this is used to create Django's internal username
@@ -14,7 +14,6 @@ class ManifoldBackend:
def authenticate(self, username=None, password=None):
if not username or not password:
return None
- print username
try:
auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
diff --git a/engine/manifold_api.py b/engine/manifoldapi.py
similarity index 78%
rename from engine/manifold_api.py
rename to engine/manifoldapi.py
index c166bd8c..b125a595 100644
--- a/engine/manifold_api.py
+++ b/engine/manifoldapi.py
@@ -2,6 +2,8 @@
import xmlrpclib
from myslice.config import Config
+debug=True
+
class ManifoldAPI:
def __init__(self, auth=None, cainfo=None):
@@ -21,7 +23,7 @@ class ManifoldAPI:
def __getattr__(self, methodName):
def func(*args, **kwds):
- print methodName, self.auth, self.url
- result=getattr(self.proxy, methodName)(self.auth, *args, **kwds)
- return result
+ result=getattr(self.proxy, methodName)(self.auth, *args, **kwds)
+ if debug: print methodName, self.auth, self.url,'->',result
+ return result
return func
diff --git a/engine/manifold_query.py b/engine/manifoldquery.py
similarity index 99%
rename from engine/manifold_query.py
rename to engine/manifoldquery.py
index 8a5690f5..b8f594e9 100644
--- a/engine/manifold_query.py
+++ b/engine/manifoldquery.py
@@ -43,6 +43,3 @@ class ManifoldQuery:
aq = self.analyzed_query.to_json() if self.analyzed_query else 'null'
return "new Query('%(a)s', '%(m)s', '%(t)s', %(f)s, %(p)s, %(c)s, %(unique)s, '%(uuid)s', %(aq)s, {{%(sq)s}})"%locals()
-
-
-
diff --git a/engine/plugin.py b/engine/plugin.py
index e7dcfa9c..fc68c48a 100644
--- a/engine/plugin.py
+++ b/engine/plugin.py
@@ -14,7 +14,8 @@ from engine.prelude import Prelude
# . [ 'SliceList', 'TabbedView' ] : to debug these classes
# . True : to debug all plugin
-DEBUG= [ 'Tabs' ]
+#DEBUG= [ 'Tabs' ]
+DEBUG= False
class Plugin:
@@ -112,7 +113,6 @@ class Plugin:
env ['settings_json' ] = settings_json
# compute plugin-specific initialization
js_init = render_to_string ( 'plugin-setenv.js', env )
- print 'js_init',js_init
self.add_js_chunks (request, js_init)
# interpret the result of requirements ()
diff --git a/engine/static/css/plugin.css b/engine/static/css/plugin.css
index 53ff87bd..0c7aaa29 100644
--- a/engine/static/css/plugin.css
+++ b/engine/static/css/plugin.css
@@ -3,3 +3,9 @@ div.plugin-toggle {
border-style: dotted;
border-width: 1px;
}
+p.plugin-show {
+ cursor: s-resize;
+}
+p.plugin-hide {
+ cursor: n-resize;
+}
diff --git a/myslice/config.py b/myslice/config.py
index 4fe5aa35..3293f1d1 100644
--- a/myslice/config.py
+++ b/myslice/config.py
@@ -1,7 +1,7 @@
class Config:
-# manifold_server = 'manifold.pl.sophia.inria.fr'
- manifold_server = 'demo.myslice.info'
+ manifold_server = 'manifold.pl.sophia.inria.fr'
+# manifold_server = 'demo.myslice.info'
manifold_port = '7080'
manifold_path = '/'
diff --git a/myslice/settings.py b/myslice/settings.py
index 4ce0e3a5..7fc65b81 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -184,7 +184,7 @@ LOGGING = {
}
}
-AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', 'auth.manifold_backend.ManifoldBackend', )
+AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', 'auth.manifoldbackend.ManifoldBackend', )
#################### for insert_above
#IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
diff --git a/myslice/viewutils.py b/myslice/viewutils.py
index 030e0d9d..ecdd81f4 100644
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@ -23,7 +23,7 @@ def topmenu_items (current,request=None):
def the_user (request):
"This code below is broken"
if not request.user.is_authenticated ():
- print 'void'
+# print 'void user!'
return ''
else:
return request.user.email
--
2.47.0