From 7518a8c8516ba22a768a95c4741442a76ee08841 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 29 Apr 2020 17:58:16 +0200 Subject: [PATCH] Revert "fix guessit" This reverts commit c02100cc --- core/support.py | 3 ++- lib/guessit/__init__.py | 2 +- lib/guessit/rules/match_processors.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/support.py b/core/support.py index 0a181ea7..2b8ac3d5 100755 --- a/core/support.py +++ b/core/support.py @@ -7,6 +7,8 @@ import os import re import sys +from lib.guessit import guessit + PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int if PY3: @@ -271,7 +273,6 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t longtitle = title + (s if title and title2 else '') + title2 + '\n' if sceneTitle: - from lib.guessit import guessit parsedTitle = guessit(title) title = longtitle = parsedTitle.get('title', '') log('TITOLO',title) diff --git a/lib/guessit/__init__.py b/lib/guessit/__init__.py index c2b99d2f..03f8d208 100644 --- a/lib/guessit/__init__.py +++ b/lib/guessit/__init__.py @@ -3,7 +3,7 @@ """ Extracts as much information as possible from a video file. """ -import monkeypatch as _monkeypatch +from . import monkeypatch as _monkeypatch from .api import guessit, GuessItApi from .options import ConfigurationException diff --git a/lib/guessit/rules/match_processors.py b/lib/guessit/rules/match_processors.py index 1b2bed4d..0b49372f 100644 --- a/lib/guessit/rules/match_processors.py +++ b/lib/guessit/rules/match_processors.py @@ -1,7 +1,7 @@ """ Match processors """ -from common import seps +from guessit.rules.common import seps def strip(match, chars=seps):