Mercurial > piecrust2
changeset 307:869a206facd5
internal: Remove mentions of plugins directories and sources.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Sun, 22 Mar 2015 22:29:06 -0700 |
| parents | 7122976bc751 |
| children | a694b78db0b1 |
| files | piecrust/__init__.py piecrust/app.py piecrust/commands/builtin/info.py piecrust/main.py |
| diffstat | 4 files changed, 9 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/piecrust/__init__.py Sun Mar 22 22:28:40 2015 -0700 +++ b/piecrust/__init__.py Sun Mar 22 22:29:06 2015 -0700 @@ -2,7 +2,6 @@ CACHE_DIR = '_cache' ASSETS_DIR = 'assets' TEMPLATES_DIR = 'templates' -PLUGINS_DIR = 'plugins' THEME_DIR = 'theme' CONFIG_PATH = 'config.yml' @@ -13,7 +12,6 @@ DEFAULT_TEMPLATE_ENGINE = 'jinja2' DEFAULT_POSTS_FS = 'flat' DEFAULT_DATE_FORMAT = '%b %d, %Y' -DEFAULT_PLUGIN_SOURCE = 'http://bitbucket.org/ludovicchabant/' DEFAULT_THEME_SOURCE = 'http://bitbucket.org/ludovicchabant/' PIECRUST_URL = 'http://bolt80.com/piecrust/'
--- a/piecrust/app.py Sun Mar 22 22:28:40 2015 -0700 +++ b/piecrust/app.py Sun Mar 22 22:29:06 2015 -0700 @@ -10,15 +10,16 @@ from piecrust import ( APP_VERSION, RESOURCES_DIR, CACHE_DIR, TEMPLATES_DIR, ASSETS_DIR, - PLUGINS_DIR, THEME_DIR, + THEME_DIR, CONFIG_PATH, THEME_CONFIG_PATH, DEFAULT_FORMAT, DEFAULT_TEMPLATE_ENGINE, DEFAULT_POSTS_FS, - DEFAULT_DATE_FORMAT, DEFAULT_PLUGIN_SOURCE, DEFAULT_THEME_SOURCE) + DEFAULT_DATE_FORMAT, DEFAULT_THEME_SOURCE) from piecrust.cache import ExtensibleCache, NullCache, NullExtensibleCache from piecrust.plugins.base import PluginLoader from piecrust.environment import StandardEnvironment -from piecrust.configuration import (Configuration, ConfigurationError, - ConfigurationLoader, merge_dicts) +from piecrust.configuration import ( + Configuration, ConfigurationError, ConfigurationLoader, + merge_dicts) from piecrust.routing import Route from piecrust.sources.base import REALM_USER, REALM_THEME from piecrust.taxonomies import Taxonomy @@ -27,7 +28,7 @@ logger = logging.getLogger(__name__) -CACHE_VERSION = 15 +CACHE_VERSION = 16 class VariantNotFoundError(Exception): @@ -117,7 +118,7 @@ ('textile', 'textile')]), 'default_auto_format': 'md', 'pagination_suffix': '/%num%', - 'plugins_sources': [DEFAULT_PLUGIN_SOURCE], + 'plugins': None, 'themes_sources': [DEFAULT_THEME_SOURCE], 'cache_time': 28800, 'enable_debug_info': True, @@ -168,9 +169,7 @@ '$') cachec['pagination_suffix_re'] = pgn_suffix_re - # Make sure plugins and theme sources are lists. - if not isinstance(sitec['plugins_sources'], list): - sitec['plugins_sources'] = [sitec['plugins_sources']] + # Make sure theme sources is a list. if not isinstance(sitec['themes_sources'], list): sitec['themes_sources'] = [sitec['themes_sources']] @@ -463,11 +462,6 @@ return templates_dirs @cached_property - def plugins_dirs(self): - return self._get_configurable_dirs(PLUGINS_DIR, - 'site/plugins_dirs') - - @cached_property def theme_dir(self): td = self._get_dir(THEME_DIR) if td is not None:
--- a/piecrust/commands/builtin/info.py Sun Mar 22 22:28:40 2015 -0700 +++ b/piecrust/commands/builtin/info.py Sun Mar 22 22:29:06 2015 -0700 @@ -93,7 +93,7 @@ def run(self, ctx): app = ctx.app - paths = ['theme_dir', 'templates_dirs', 'plugins_dirs', 'cache_dir'] + paths = ['theme_dir', 'templates_dirs', 'cache_dir'] for p in paths: value = getattr(app, p) if isinstance(value, list):