Commits

Olemis Lang committed e54fbf0

BH Multiproduct #115 : Unicode conversion improved . Do not inherit environment's config ... (failures=2, errors=2)

Ran 27 tests in 2.457s

Comments (0)

Files changed (1)

t115/t115_r1427886_product_config.diff

 # HG changeset patch
-# Parent 56bf5ca5136d057fa2bd9600aab7aabc0ae76927
+# Parent beed3d3bb95c8439bd31a7a68840c036e5f1a29c
 BH Multiproduct #115 : Product-specific settings
 
-diff -r 56bf5ca5136d bloodhound_dashboard/bhdashboard/model.py
---- a/bloodhound_dashboard/bhdashboard/model.py	Sun Jan 06 12:53:47 2013 -0500
-+++ b/bloodhound_dashboard/bhdashboard/model.py	Mon Jan 07 03:02:57 2013 -0500
+diff -r beed3d3bb95c bloodhound_dashboard/bhdashboard/model.py
+--- a/bloodhound_dashboard/bhdashboard/model.py	Mon Jan 07 13:44:27 2013 -0500
++++ b/bloodhound_dashboard/bhdashboard/model.py	Mon Jan 07 22:58:47 2013 -0500
 @@ -117,8 +117,9 @@
                  self._update_from_row(row)
                  break
              # we won't know which class we need until called
              model = cls.__new__(cls)
              data = dict([(fields[i], row[i]) for i in range(len(fields))])
-diff -r 56bf5ca5136d bloodhound_multiproduct/multiproduct/api.py
---- a/bloodhound_multiproduct/multiproduct/api.py	Sun Jan 06 12:53:47 2013 -0500
-+++ b/bloodhound_multiproduct/multiproduct/api.py	Mon Jan 07 03:02:57 2013 -0500
+diff -r beed3d3bb95c bloodhound_multiproduct/multiproduct/api.py
+--- a/bloodhound_multiproduct/multiproduct/api.py	Mon Jan 07 13:44:27 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/api.py	Mon Jan 07 22:58:47 2013 -0500
 @@ -31,9 +31,9 @@
  from trac.util.translation import _, N_
  from trac.web.chrome import ITemplateProvider
      del modelcls
      
      def get_version(self):
-diff -r 56bf5ca5136d bloodhound_multiproduct/multiproduct/config.py
+diff -r beed3d3bb95c bloodhound_multiproduct/multiproduct/config.py
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/bloodhound_multiproduct/multiproduct/config.py	Mon Jan 07 03:02:57 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/config.py	Mon Jan 07 22:58:47 2013 -0500
 @@ -0,0 +1,291 @@
 +
 +#  Licensed to the Apache Software Foundation (ASF) under one
 +        `trac.env.Environment` and product prefix.
 +
 +        Optionally it is possible to inherit settings from parent
-+        Configuration objects. Environment's configuration will 
-+        always be added to parents list.
++        Configuration objects. Environment's configuration will not
++        be added to parents list.
 +        """
 +        self.env = env
-+        self.parents = (parents or []) + [self.env.config]
++        self.parents = (parents or [])
 +        self.product = to_unicode(product)
 +        self._sections = {}
 +
 +        These changes will be persistent right away.
 +        """
 +        key_str = to_unicode(key)
-+        value_str = value
++        value_str = to_unicode(value)
 +        self._cache.pop(key_str, None)
 +        option_key = {
 +                'product' : self.product, 
 +                setting.value = value
 +                setting.update()
 +
-diff -r 56bf5ca5136d bloodhound_multiproduct/multiproduct/model.py
---- a/bloodhound_multiproduct/multiproduct/model.py	Sun Jan 06 12:53:47 2013 -0500
-+++ b/bloodhound_multiproduct/multiproduct/model.py	Mon Jan 07 03:02:57 2013 -0500
+diff -r beed3d3bb95c bloodhound_multiproduct/multiproduct/model.py
+--- a/bloodhound_multiproduct/multiproduct/model.py	Mon Jan 07 13:44:27 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/model.py	Mon Jan 07 22:58:47 2013 -0500
 @@ -18,6 +18,7 @@
  
  """Models to support multi-product"""