Changeset 14614

Timestamp:

Mar 20, 2016, 11:36:23 PM (10 years ago)

Author:

Ryan J Ollos

Message:

1.2dev: Merge [14613] from 1.0-stable

Refs #12410.

Location:

trunk

Files:

• . (modified) (1 prop)
• trac/admin/web_ui.py (modified) (2 diffs)
• trac/env.py (modified) (1 diff)
• trac/loader.py (modified) (2 diffs)

trunk/trac/admin/web_ui.py

@@ -25 +25 @@
 from trac.admin.api import IAdminPanelProvider
 from trac.core import *
-from trac.loader import get_plugin_info, get_plugins_dir
+from trac.loader import get_plugin_info
 from trac.log import LOG_LEVELS
 from trac.perm import PermissionSystem, IPermissionRequestor
@@ -599 +599 @@
         data = {
             'plugins': plugins, 'show': req.args.get('show'),
-            'readonly': not os.access(get_plugins_dir(self.env),
+            'readonly': not os.access(self.env.get_plugins_dir(),
                                       os.F_OK + os.W_OK),
             'safe_wiki_to_html': safe_wiki_to_html,

trunk/trac/env.py

@@ -643 +643 @@
         return os.path.join(self.path, 'conf', 'trac.ini')
 
+    def _get_path_to_dir(self, dir):
+        path = os.path.join(self.path, dir)
+        return os.path.normcase(os.path.realpath(path))
+
     def get_templates_dir(self):
         """Return absolute path to the templates directory."""
-        return os.path.join(self.path, 'templates')
+        return self._get_path_to_dir('templates')
 
     def get_htdocs_dir(self):
         """Return absolute path to the htdocs directory."""
-        return os.path.join(self.path, 'htdocs')
+        return self._get_path_to_dir('htdocs')
 
     def get_log_dir(self):
         """Return absolute path to the log directory."""
-        return os.path.join(self.path, 'log')
+        return self._get_path_to_dir('log')
+
+    def get_plugins_dir(self):
+        """Return absolute path to the plugins directory."""
+        return self._get_path_to_dir('plugins')
 
     def setup_log(self):

trunk/trac/loader.py

@@ -98 +98 @@
     return _load_py_files
 
+
 def get_plugins_dir(env):
-    """Return the path to the `plugins` directory of the environment."""
-    plugins_dir = os.path.realpath(os.path.join(env.path, 'plugins'))
-    return os.path.normcase(plugins_dir)
+    """Return the path to the `plugins` directory of the environment.
+
+    :since 1.0.11: Deprecated and will be removed in 1.3.1. Use
+                   Environment.get_plugins_dir() instead."""
+    return env.get_plugins_dir()
+
 
 def load_components(env, extra_path=None, loaders=(load_eggs('trac.plugins'),
                                                    load_py_files())):
     """Load all plugin components found on the given search path."""
-    plugins_dir = get_plugins_dir(env)
+    plugins_dir = env.get_plugins_dir()
     search_path = [plugins_dir]
     if extra_path:
@@ -135 +139 @@
         return dist
 
-    plugins_dir = get_plugins_dir(env)
+    plugins_dir = env.get_plugins_dir()
     plugins = {}
     from trac.core import ComponentMeta