Removed
Link Here
|
1 |
Revert https://github.com/Flexget/Flexget/commit/0a401204a107 |
2 |
|
3 |
--- flexget/api/core/server.py.orig 2019-05-25 02:03:39 UTC |
4 |
+++ flexget/api/core/server.py |
5 |
@@ -571,6 +571,6 @@ class ServerCrashLogAPI(APIResource): |
6 |
path = Path(self.manager.config_base) |
7 |
crashes = [ |
8 |
{'name': file.name, 'content': file.open().readlines()} |
9 |
- for file in path.listdir(match='crash_report*.log') |
10 |
+ for file in path.listdir(pattern='crash_report*.log') |
11 |
] |
12 |
return jsonify(crashes) |
13 |
--- flexget/plugin.py.orig 2019-05-25 02:03:39 UTC |
14 |
+++ flexget/plugin.py |
15 |
@@ -476,7 +476,7 @@ def _load_plugins_from_dirs(dirs): |
16 |
_f for _f in plugin_path.relpath(plugins_dir).parent.splitall() if _f |
17 |
] |
18 |
module_name = '.'.join( |
19 |
- [plugins_pkg.__name__] + plugin_subpackages + [plugin_path.stem] |
20 |
+ [plugins_pkg.__name__] + plugin_subpackages + [plugin_path.namebase] |
21 |
) |
22 |
_import_plugin(module_name, plugin_path) |
23 |
_check_phase_queue() |
24 |
@@ -498,7 +498,7 @@ def _load_components_from_dirs(dirs): |
25 |
_f for _f in component_path.relpath(component_dir).parent.splitall() if _f |
26 |
] |
27 |
package_name = '.'.join( |
28 |
- [components_pkg.__name__] + plugin_subpackages + [component_path.stem] |
29 |
+ [components_pkg.__name__] + plugin_subpackages + [component_path.namebase] |
30 |
) |
31 |
_import_plugin(package_name, component_path) |
32 |
_check_phase_queue() |
33 |
--- flexget/plugins/input/filesystem.py.orig 2019-05-25 02:03:39 UTC |
34 |
+++ flexget/plugins/input/filesystem.py |
35 |
@@ -129,7 +129,7 @@ class Filesystem(object): |
36 |
entry['url'] = pathlib.Path(filepath).absolute().as_uri() |
37 |
entry['filename'] = filepath.name |
38 |
if filepath.isfile(): |
39 |
- entry['title'] = filepath.stem |
40 |
+ entry['title'] = filepath.namebase |
41 |
else: |
42 |
entry['title'] = filepath.name |
43 |
try: |
44 |
--- flexget/tests/test_filesystem.py.orig 2019-05-25 02:03:39 UTC |
45 |
+++ flexget/tests/test_filesystem.py |
46 |
@@ -137,10 +137,10 @@ class TestFilesystem(object): |
47 |
task_name, |
48 |
file, |
49 |
) |
50 |
- assert task.find_entry(title=file.stem), assertion_error |
51 |
+ assert task.find_entry(title=file.namebase), assertion_error |
52 |
else: |
53 |
assertion_error = 'Failed %s %s test, found %s' % (test_type, task_name, file) |
54 |
- assert not task.find_entry(title=file.stem), assertion_error |
55 |
+ assert not task.find_entry(title=file.namebase), assertion_error |
56 |
|
57 |
def test_string(self, execute_task): |
58 |
task_name = 'string' |
59 |
--- requirements.txt.orig 2019-05-25 02:03:39 UTC |
60 |
+++ requirements.txt |
61 |
@@ -13,7 +13,7 @@ jinja2~=2.10 |
62 |
requests>=2.20.0 |
63 |
python-dateutil |
64 |
jsonschema>=2.0 |
65 |
-path.py>=10.6 |
66 |
+path.py>=8.1.1,<10.6 |
67 |
pathlib>=1.0; python_version<'3.4' |
68 |
guessit==3.0.3 |
69 |
rebulk>=0.9.0 |