Changeset 4012

Timestamp:

07/14/08 08:14:56 (3 months ago)

Author:

eblot

Message:

Closes #2674.

• Fix up the invalid syntax in url_parts
  
• Use the new Trac API for options (so that TracIni now shows up the proper option)
  
  

Thanks to anonymous for the original patch.

Files:

• revtreeplugin/0.11/revtree/web_ui.py (modified) (6 diffs)
• revtreeplugin/0.11/setup.py (modified) (1 diff)

revtreeplugin/0.11/revtree/web_ui.py

@@ -21 +21 @@
-from revtree.api import EmptyRangeError, RevtreeSystem
-from revtree.model import Repository
+from trac.config import Option, IntOption, BoolOption, ListOption, \
+                        Section, ConfigurationError
-from trac.core import *
-from trac.perm import IPermissionRequestor
@@ -120 +122 @@
-
-
+class FloatOption(Option):
+    """Descriptor for float configuration options.
+       Option for real number is missing in Trac
+    """
+    
+    def accessor(self, section, name, default=''):
+        """Return the value of the specified option as float.
+        
+        If the specified option can not be converted to a float, a
+        `ConfigurationError` exception is raised.
+        
+        Valid default input is a string or a float. Returns an float.
+        """
+        value = section.get(name, default)
+        if not value:
+            return 0.0
+        try:
+            return float(value)
+        except ValueError:
+            raise ConfigurationError('expected real number, got %s' % \
+                                     repr(value))
+
+class ChoiceOption(Option):
+    """Descriptor for choice configuration options."""
+
+    def __init__(self, section, name, default=None, choices='', doc=''):
+        Option.__init__(self, section, name, default, doc)
+        self.choices = filter(None, [c.strip() for c in choices.split(',')])
+
+    def accessor(self, section, name, default):
+        value = section.get(name, default)
+        if value not in self.choices:
+            raise ConfigurationError('expected a choice among "%s", got %s' % \
+                                     (', '.join(self.choices), repr(value)))
+        return value
+
+    
-class RevtreeModule(Component):
-    """Implements the revision tree feature"""
@@ -125 +164 @@
-    implements(IPermissionRequestor, INavigationContributor, \
-               IRequestFilter, IRequestHandler, ITemplateProvider)
-
+
+
-    PERIODS = { 1: 'day', 2: '2 days', 3: '3 days', 5: '5 days', 7:'week',
-                14: 'fortnight', 31: 'month', 61: '2 months', 
-                91: 'quarter', 183: 'semester', 366: 'year', 0: 'all' }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # IPermissionRequestor methods
-
@@ -155 +221 @@
-    def post_process_request(self, req, template, data, content_type):
-        if req.perm.has_permission('REVTREE_VIEW'):
-
-
-
+
+
+
+
-        return (template, data, content_type)
-
@@ -188 +255 @@
-    def get_templates_dirs(self):
-        """Return the absolute path of the directory containing the provided
-ClearSilver
+Genshi
-        """
-        from pkg_resources import resource_filename
@@ -197 +264 @@
-    def __init__(self):
-        """Reads the configuration and run sanity checks"""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        self.rt = RevtreeSystem(self.env)
-

revtreeplugin/0.11/setup.py

@@ -16 +16 @@
-
-PACKAGE = 'TracRevtreePlugin'
-5
+6
-
-setup (