|
13 | 13 |
|
14 | 14 | * extra directories defined in the settings |
15 | 15 | * homedir's ``plugins`` directory |
16 | | -* homedir's ``modules`` directory |
17 | 16 | * ``sopel.plugins`` setuptools entry points |
18 | 17 | * ``sopel_modules``'s subpackages |
19 | 18 | * ``sopel.modules``'s core plugins |
@@ -137,33 +136,30 @@ def enumerate_plugins(settings): |
137 | 136 |
|
138 | 137 | .. seealso:: |
139 | 138 |
|
140 | | - The find functions used are: |
| 139 | + The find functions used are: |
141 | 140 |
|
142 | | - * :func:`find_internal_plugins` for internal plugins |
143 | | - * :func:`find_sopel_modules_plugins` for ``sopel_modules.*`` plugins |
144 | | - * :func:`find_entry_point_plugins` for plugins exposed by setuptools |
145 | | - entry points |
146 | | - * :func:`find_directory_plugins` for plugins in ``$homedir/modules``, |
147 | | - ``$homedir/plugins``, and in extra directories, as defined by |
148 | | - ``settings.core.extra`` |
| 141 | + * :func:`find_internal_plugins` for internal plugins |
| 142 | + * :func:`find_sopel_modules_plugins` for ``sopel_modules.*`` plugins |
| 143 | + * :func:`find_entry_point_plugins` for plugins exposed by setuptools |
| 144 | + entry points |
| 145 | + * :func:`find_directory_plugins` for plugins in ``$homedir/plugins``, |
| 146 | + and in extra directories as defined by ``settings.core.extra`` |
149 | 147 |
|
150 | | - .. versionchanged:: 7.0 |
| 148 | + .. versionchanged:: 8.0 |
151 | 149 |
|
152 | | - Previously, plugins were called "modules", so this would load plugins |
153 | | - from the ``$homedir/modules`` directory. Now it also loads plugins |
154 | | - from the ``$homedir/plugins`` directory. |
| 150 | + Looks in ``$homedir/plugins`` instead of the ``$homedir/modules`` |
| 151 | + directory, reflecting Sopel's shift away from calling them "modules". |
155 | 152 |
|
156 | 153 | """ |
157 | 154 | from_internals = find_internal_plugins() |
158 | 155 | from_sopel_modules = find_sopel_modules_plugins() |
159 | 156 | from_entry_points = find_entry_point_plugins() |
160 | 157 | # load from directories |
161 | 158 | source_dirs = [ |
162 | | - os.path.join(settings.homedir, 'modules'), |
163 | 159 | os.path.join(settings.homedir, 'plugins'), |
164 | 160 | ] |
165 | 161 | if settings.core.extra: |
166 | | - source_dirs = source_dirs + list(settings.core.extra) |
| 162 | + source_dirs = source_dirs + settings.core.extra |
167 | 163 |
|
168 | 164 | from_directories = [ |
169 | 165 | find_directory_plugins(source_dir) |
@@ -205,7 +201,7 @@ def get_usable_plugins(settings): |
205 | 201 | contains one and only one plugin per unique name, using a specific order: |
206 | 202 |
|
207 | 203 | * extra directories defined in the settings |
208 | | - * homedir's ``modules`` directory |
| 204 | + * homedir's ``plugins`` directory |
209 | 205 | * ``sopel.plugins`` setuptools entry points |
210 | 206 | * ``sopel_modules``'s subpackages |
211 | 207 | * ``sopel.modules``'s core plugins |
|
0 commit comments