• echel0n's avatar
    Merge branch 'migrate/py3' of https://git.sickrage.ca/SiCKRAGE/sickrage into migrate/py3 · 5d2d284d
    echel0n authored
    # Conflicts:
    #	requirements-dev.txt
    #	requirements.txt
    #	sickrage/__init__.py
    #	sickrage/autoProcessTV/__init__.py
    #	sickrage/autoProcessTV/hellaToSiCKRAGE.py
    #	sickrage/clients/__init__.py
    #	sickrage/clients/deluge.py
    #	sickrage/clients/deluged.py
    #	sickrage/clients/download_station.py
    #	sickrage/clients/mlnet.py
    #	sickrage/clients/putio.py
    #	sickrage/clients/qbittorrent.py
    #	sickrage/clients/rtorrent.py
    #	sickrage/clients/sabnzbd.py
    #	sickrage/clients/transmission.py
    #	sickrage/clients/utorrent.py
    #	sickrage/core/__init__.py
    #	sickrage/core/api/__init__.py
    #	sickrage/core/blackandwhitelist.py
    #	sickrage/core/caches/quicksearch_cache.py
    #	sickrage/core/caches/tv_cache.py
    #	sickrage/core/classes.py
    #	sickrage/core/config.py
    #	sickrage/core/databases/__init__.py
    #	sickrage/core/databases/cache/__init__.py
    #	sickrage/core/databases/main/__init__.py
    #	sickrage/core/exceptions/__init__.py
    #	sickrage/core/helpers/__init__.py
    #	sickrage/core/helpers/browser.py
    #	sickrage/core/helpers/compat.py
    #	sickrage/core/helpers/metadata.py
    #	sickrage/core/helpers/show_names.py
    #	sickrage/core/helpers/srdatetime.py
    #	sickrage/core/imdb_popular.py
    #	sickrage/core/logger.py
    #	sickrage/core/media/banner.py
    #	sickrage/core/media/fanart.py
    #	sickrage/core/media/network.py
    #	sickrage/core/media/poster.py
    #	sickrage/core/media/util.py
    #	sickrage/core/nameparser/__init__.py
    #	sickrage/core/nameparser/episode.py
    #	sickrage/core/nameparser/show.py
    #	sickrage/core/nameparser/validator.py
    #	sickrage/core/process_tv.py
    #	sickrage/core/processors/auto_postprocessor.py
    #	sickrage/core/processors/failed_processor.py
    #	sickrage/core/processors/post_processor.py
    #	sickrage/core/queues/event.py
    #	sickrage/core/queues/search.py
    #	sickrage/core/queues/show.py
    #	sickrage/core/scene_exceptions.py
    #	sickrage/core/scene_numbering.py
    #	sickrage/core/search.py
    #	sickrage/core/searchers/__init__.py
    #	sickrage/core/searchers/backlog_searcher.py
    #	sickrage/core/searchers/daily_searcher.py
    #	sickrage/core/searchers/failed_snatch_searcher.py
    #	sickrage/core/searchers/proper_searcher.py
    #	sickrage/core/searchers/subtitle_searcher.py
    #	sickrage/core/searchers/trakt_searcher.py
    #	sickrage/core/tv/episode/__init__.py
    #	sickrage/core/tv/show/__init__.py
    #	sickrage/core/tv/show/coming_episodes.py
    #	sickrage/core/tv/show/history.py
    #	sickrage/core/ui.py
    #	sickrage/core/updaters/show_updater.py
    #	sickrage/core/updaters/tz_updater.py
    #	sickrage/core/version_updater.py
    #	sickrage/core/webserver/__init__.py
    #	sickrage/core/webserver/api.py
    #	sickrage/core/webserver/routes.py
    #	sickrage/core/webserver/views.py
    #	sickrage/indexers/__init__.py
    #	sickrage/indexers/config.py
    #	sickrage/indexers/thetvdb/api.py
    #	sickrage/libs/fanart/__init__.py
    #	sickrage/libs/fanart/errors.py
    #	sickrage/libs/fanart/immutable.py
    #	sickrage/libs/fanart/items.py
    #	sickrage/libs/fanart/movie.py
    #	sickrage/libs/fanart/music.py
    #	sickrage/libs/fanart/tv.py
    #	sickrage/libs/upnpclient/__init__.py
    #	sickrage/libs/upnpclient/errors.py
    #	sickrage/libs/upnpclient/marshal.py
    #	sickrage/libs/upnpclient/soap.py
    #	sickrage/libs/upnpclient/ssdp.py
    #	sickrage/libs/upnpclient/upnp.py
    #	sickrage/libs/upnpclient/util.py
    #	sickrage/metadata/kodi.py
    #	sickrage/metadata/kodi_12plus.py
    #	sickrage/metadata/mede8er.py
    #	sickrage/metadata/mediabrowser.py
    #	sickrage/metadata/ps3.py
    #	sickrage/metadata/tivo.py
    #	sickrage/metadata/wdtv.py
    #	sickrage/notifiers/boxcar2.py
    #	sickrage/notifiers/discord.py
    #	sickrage/notifiers/emailnotify.py
    #	sickrage/notifiers/freemobile.py
    #	sickrage/notifiers/growl.py
    #	sickrage/notifiers/join.py
    #	sickrage/notifiers/libnotify.py
    #	sickrage/notifiers/nma.py
    #	sickrage/notifiers/pushbullet.py
    #	sickrage/notifiers/slack.py
    #	sickrage/notifiers/synoindex.py
    #	sickrage/notifiers/synology.py
    #	sickrage/notifiers/telegram.py
    #	sickrage/notifiers/trakt.py
    #	sickrage/notifiers/tweet.py
    #	sickrage/notifiers/twilio_notifer.py
    #	sickrage/providers/__init__.py
    #	sickrage/providers/nzb/anizb.py
    #	sickrage/providers/nzb/binsearch.py
    #	sickrage/providers/torrent/abnormal.py
    #	sickrage/providers/torrent/alpharatio.py
    #	sickrage/providers/torrent/archetorrent.py
    #	sickrage/providers/torrent/bitcannon.py
    #	sickrage/providers/torrent/bitsoup.py
    #	sickrage/providers/torrent/btn.py
    #	sickrage/providers/torrent/danishbits.py
    #	sickrage/providers/torrent/elitetorrent.py
    #	sickrage/providers/torrent/filelist.py
    #	sickrage/providers/torrent/hd4free.py
    #	sickrage/providers/torrent/hdbits.py
    #	sickrage/providers/torrent/hdspace.py
    #	sickrage/providers/torrent/hdtorrents.py
    #	sickrage/providers/torrent/horriblesubs.py
    #	sickrage/providers/torrent/hounddawgs.py
    #	sickrage/providers/torrent/immortalseed.py
    #	sickrage/providers/torrent/iptorrents.py
    #	sickrage/providers/torrent/limetorrents.py
    #	sickrage/providers/torrent/morethantv.py
    #	sickrage/providers/torrent/ncore.py
    #	sickrage/providers/torrent/nebulance.py
    #	sickrage/providers/torrent/newpct.py
    #	sickrage/providers/torrent/norbits.py
    #	sickrage/providers/torrent/nyaatorrents.py
    #	sickrage/providers/torrent/pretome.py
    #	sickrage/providers/torrent/rarbg.py
    #	sickrage/providers/torrent/scenetime.py
    #	sickrage/providers/torrent/shazbat.py
    #	sickrage/providers/torrent/skytorrents.py
    #	sickrage/providers/torrent/thepiratebay.py
    #	sickrage/providers/torrent/tntvillage.py
    #	sickrage/providers/torrent/tokyotoshokan.py
    #	sickrage/providers/torrent/torrentbytes.py
    #	sickrage/providers/torrent/torrentday.py
    #	sickrage/providers/torrent/torrentleech.py
    #	sickrage/providers/torrent/torrentproject.py
    #	sickrage/providers/torrent/torrentz.py
    #	sickrage/providers/torrent/tvchaosuk.py
    #	sickrage/providers/torrent/xthor.py
    #	sickrage/providers/torrent/yggtorrent.py
    #	sickrage/providers/torrent/zooqle.py
    #	sickrage/subtitles/__init__.py
    #	sickrage/subtitles/providers/itasa.py
    #	sickrage/subtitles/providers/utils.py
    #	tests/__init__.py
    #	tests/test_common.py
    #	tests/test_config.py
    #	tests/test_helpers.py
    5d2d284d