Improve compatibility with the pyforms library

UmSenhorQualquer · May 18, 2018 · ee92b6a · ee92b6a
1 parent 60558e4
commit ee92b6a
Show file tree

Hide file tree

Showing 66 changed files with 508 additions and 514 deletions.
diff --git a/pyforms/__init__.py b/pyforms/__init__.py
diff --git a/pyforms/utils/__init__.py b/pyforms/utils/__init__.py
diff --git a/pyforms/utils/settings_manager.py b/pyforms/utils/settings_manager.py
diff --git a/pyforms_web/__init__.py b/pyforms_web/__init__.py
@@ -1 +1 @@
-from pyforms import conf; conf += 'pyforms_web.settings'
+from confapp import conf; conf += 'pyforms_web.settings'
diff --git a/pyforms_web/basewidget.py b/pyforms_web/basewidget.py
@@ -1,22 +1,21 @@
 
-from .controls.ControlBase import ControlBase
-from .controls.ControlFile import ControlFile
-from .controls.ControlSlider import ControlSlider
-from .controls.ControlText import ControlText
-from .controls.ControlCheckBox import ControlCheckBox
-from .controls.ControlLabel import ControlLabel
+from .controls.control_base     import ControlBase
+from .controls.control_file     import ControlFile
+from .controls.control_slider   import ControlSlider
+from .controls.control_text     import ControlText
+from .controls.control_checkbox import ControlCheckBox
+from .controls.control_label    import ControlLabel
+from .controls.control_button   import ControlButton
 try:
-    from .controls.ControlPlayer import ControlPlayer
+    from .controls.control_player import ControlPlayer
 except:
     print("ControlPlayer is not available")
-from .controls.ControlButton import ControlButton
 from .web.applications import ApplicationsLoader
-from .web.middleware import PyFormsMiddleware
+from .web.middleware   import PyFormsMiddleware
 import uuid, os, shutil, base64, inspect
 import base64, dill, simplejson, filelock
-from pyforms import conf
+from confapp import conf
 from django.template.loader import render_to_string
-
 from .utils import make_lambda_func
 
 class no_columns(object):
@@ -183,16 +182,16 @@ def generate_control(self, row):
         control = self.controls.get(row, None)
         if control==None:
             if   row==' ':                   return "<div class='field' ></div>"
-            elif row.startswith('h1:'):      return "<h1>{0}</h1>".format(row[3:])
-            elif row.startswith('h1-right:'):return "<h1 class='ui right aligned header' >{0}</h1>".format(row[9:])
-            elif row.startswith('h2:'):      return "<h2>{0}</h2>".format(row[3:])
-            elif row.startswith('h2-right:'):return "<h2 class='ui right aligned header' >{0}</h2>".format(row[9:])
-            elif row.startswith('h3:'):      return "<h3>{0}</h3>".format(row[3:])
-            elif row.startswith('h3-right:'):return "<h3 class='ui right aligned header' >{0}</h3>".format(row[9:])
-            elif row.startswith('h4:'):      return "<h4>{0}</h4>".format(row[3:])
-            elif row.startswith('h4-right:'):return "<h4 class='ui right aligned header' >{0}</h4>".format(row[9:])
-            elif row.startswith('h5:'):      return "<h5>{0}</h5>".format(row[3:])
-            elif row.startswith('h5-right:'):return "<h5 class='ui right aligned header' >{0}</h5>".format(row[9:])
+            elif row.startswith('h1:'):      return "<h1 class='field' >{0}</h1>".format(row[3:])
+            elif row.startswith('h1-right:'):return "<h1 class='ui right aligned header field' >{0}</h1>".format(row[9:])
+            elif row.startswith('h2:'):      return "<h2 class='field' >{0}</h2>".format(row[3:])
+            elif row.startswith('h2-right:'):return "<h2 class='ui right aligned header field' >{0}</h2>".format(row[9:])
+            elif row.startswith('h3:'):      return "<h3 class='field' >{0}</h3>".format(row[3:])
+            elif row.startswith('h3-right:'):return "<h3 class='ui right aligned header field' >{0}</h3>".format(row[9:])
+            elif row.startswith('h4:'):      return "<h4 class='field' >{0}</h4>".format(row[3:])
+            elif row.startswith('h4-right:'):return "<h4 class='ui right aligned header field' >{0}</h4>".format(row[9:])
+            elif row.startswith('h5:'):      return "<h5 class='field' >{0}</h5>".format(row[3:])
+            elif row.startswith('h5-right:'):return "<h5 class='ui right aligned header field' >{0}</h5>".format(row[9:])
             elif row.startswith('info:'):    return "<div class='ui info visible message'>{0}</div>".format(row[5:])
             elif row.startswith('warning:'): return "<div class='ui warning visible message'>{0}</div>".format(row[8:])
             elif row.startswith('alert:'):   return "<div class='ui error visible message'>{0}</div>".format(row[6:])

diff --git a/pyforms_web/controls/ControlFile.py b/pyforms_web/controls/ControlFile.py
diff --git a/pyforms_web/controls/ControlPlayer.py b/pyforms_web/controls/ControlPlayer.py
diff --git a/pyforms_web/controls/ControlSlider.py b/pyforms_web/controls/ControlSlider.py
diff --git a/pyforms_web/controls/__init__.py b/pyforms_web/controls/__init__.py
@@ -1,2 +1,2 @@
-__author__="ricardo"
-__date__ ="$Aug 18, 2012 12:50:07 PM$"
+__author__ = "ricardo"
+
diff --git a/pyforms_web/controls/ControlAutoComplete.py → pyforms_web/controls/control_autocomplete.py b/pyforms_web/controls/ControlAutoComplete.py → pyforms_web/controls/control_autocomplete.py
@@ -1,4 +1,4 @@
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson, collections
 
 class ValueNotSet: pass

diff --git a/pyforms_web/controls/ControlBase.py → pyforms_web/controls/control_base.py b/pyforms_web/controls/ControlBase.py → pyforms_web/controls/control_base.py
@@ -1,5 +1,5 @@
 import uuid
-from pyforms import conf
+from confapp import conf
 from pyforms_web.web.middleware import PyFormsMiddleware
 
 class ControlBase(object):

diff --git a/...rms_web/controls/ControlBoundingSlider.py → ...ms_web/controls/control_boundingslider.py b/...rms_web/controls/ControlBoundingSlider.py → ...ms_web/controls/control_boundingslider.py
@@ -1,4 +1,4 @@
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
 class ControlBoundingSlider(ControlBase):

diff --git a/pyforms_web/controls/ControlBreadcrumb.py → pyforms_web/controls/control_breadcrumb.py b/pyforms_web/controls/ControlBreadcrumb.py → pyforms_web/controls/control_breadcrumb.py
@@ -1,4 +1,4 @@
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
 class ControlBreadcrumb(ControlBase):

diff --git a/pyforms_web/controls/ControlButton.py → pyforms_web/controls/control_button.py b/pyforms_web/controls/ControlButton.py → pyforms_web/controls/control_button.py
@@ -1,4 +1,4 @@
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
 class ControlButton(ControlBase):

diff --git a/pyforms_web/controls/ControlCalendar.py → pyforms_web/controls/control_calendar.py b/pyforms_web/controls/ControlCalendar.py → pyforms_web/controls/control_calendar.py
@@ -1,5 +1,5 @@
 from datetime import date
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
 class ControlCalendar(ControlBase):

diff --git a/pyforms_web/controls/ControlCheckBox.py → pyforms_web/controls/control_checkbox.py b/pyforms_web/controls/ControlCheckBox.py → pyforms_web/controls/control_checkbox.py
@@ -1,4 +1,4 @@
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
 class ControlCheckBox(ControlBase):

diff --git a/pyforms_web/controls/ControlCheckBoxList.py → pyforms_web/controls/control_checkboxlist.py b/pyforms_web/controls/ControlCheckBoxList.py → pyforms_web/controls/control_checkboxlist.py
@@ -1,4 +1,4 @@
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
 

diff --git a/..._web/controls/ControlCheckBoxListQuery.py → ...web/controls/control_checkboxlistquery.py b/..._web/controls/ControlCheckBoxListQuery.py → ...web/controls/control_checkboxlistquery.py
@@ -1,5 +1,5 @@
-from pyforms_web.controls.ControlBase         import ControlBase
-from pyforms_web.controls.ControlCheckBoxList import ControlCheckBoxList
+from pyforms_web.controls.control_base         import ControlBase
+from pyforms_web.controls.control_checkboxlist import ControlCheckBoxList
 from django.apps                                  import apps
 import simplejson, collections
 

diff --git a/pyforms_web/controls/ControlCombo.py → pyforms_web/controls/control_combo.py b/pyforms_web/controls/ControlCombo.py → pyforms_web/controls/control_combo.py
@@ -1,4 +1,4 @@
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson, collections
 
 class ValueNotSet: pass

diff --git a/pyforms_web/controls/ControlDate.py → pyforms_web/controls/control_date.py b/pyforms_web/controls/ControlDate.py → pyforms_web/controls/control_date.py
@@ -1,5 +1,5 @@
 import datetime
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
 from django.utils.dateparse import parse_datetime

diff --git a/pyforms_web/controls/ControlDateTime.py → pyforms_web/controls/control_datetime.py b/pyforms_web/controls/ControlDateTime.py → pyforms_web/controls/control_datetime.py
@@ -1,5 +1,5 @@
 import datetime
-from pyforms_web.controls.ControlBase import ControlBase
+from pyforms_web.controls.control_base import ControlBase
 import simplejson
 
 from django.utils.dateparse import parse_datetime