diff --git a/gui/slick/views/config_general.mako b/gui/slick/views/config_general.mako
index 0f792f56b71368ab036546b4a7df79f0cf8cb23c..feb4cbffe73fcc2c410226addc1e4ba2a1bf576c 100644
--- a/gui/slick/views/config_general.mako
+++ b/gui/slick/views/config_general.mako
@@ -750,17 +750,6 @@
</span>
</label>
</div>
-
- <div class="field-pair" hidden>
- <label for="git_autoissues">
- <span class="component-title">Git auto-issues submit</span>
- <span class="component-desc">
- <input type="checkbox" name="git_autoissues" id="git_autoissues" ${('', 'checked="checked"')[bool(sickbeard.GIT_AUTOISSUES)]} disable/>
- <p>automatically submit bug/issue reports to our issue tracker when errors are logged</p>
- </span>
- </label>
- </div>
-
<input type="submit" class="btn config_submitter" value="Save Changes" />
</fieldset>
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 98224fc0078606b1bb2b697c540b75b7d1c43556..6e6edb08b40d70adebd0da02c7da196b5246ea1e 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -137,7 +137,6 @@ GIT_REPO = 'SickRage'
GIT_USERNAME = None
GIT_PASSWORD = None
GIT_PATH = None
-GIT_AUTOISSUES = False
DEVELOPER = False
NEWS_URL = 'http://sickrage.github.io/sickrage-news/news.md'
@@ -622,7 +621,7 @@ def initialize(consoleLogging=True):
AUTOPOSTPROCESSER_FREQUENCY, SHOWUPDATE_HOUR, \
ANIME_DEFAULT, NAMING_ANIME, ANIMESUPPORT, USE_ANIDB, ANIDB_USERNAME, ANIDB_PASSWORD, ANIDB_USE_MYLIST, \
ANIME_SPLIT_HOME, SCENE_DEFAULT, DOWNLOAD_URL, BACKLOG_DAYS, GIT_USERNAME, GIT_PASSWORD, \
- GIT_AUTOISSUES, DEVELOPER, gh, DISPLAY_ALL_SEASONS, SSL_VERIFY, NEWS_LAST_READ, NEWS_LATEST, SOCKET_TIMEOUT
+ DEVELOPER, gh, DISPLAY_ALL_SEASONS, SSL_VERIFY, NEWS_LAST_READ, NEWS_LATEST, SOCKET_TIMEOUT
if __INITIALIZED__:
return False
@@ -654,8 +653,6 @@ def initialize(consoleLogging=True):
ENCRYPTION_VERSION = check_setting_int(CFG, 'General', 'encryption_version', 0)
ENCRYPTION_SECRET = check_setting_str(CFG, 'General', 'encryption_secret', helpers.generateCookieSecret(), censor_log=True)
- GIT_AUTOISSUES = bool(check_setting_int(CFG, 'General', 'git_autoissues', 0))
-
# git login info
GIT_USERNAME = check_setting_str(CFG, 'General', 'git_username', '')
GIT_PASSWORD = check_setting_str(CFG, 'General', 'git_password', '', censor_log=True)
@@ -1601,7 +1598,6 @@ def save_config():
# For passwords you must include the word `password` in the item_name and add `helpers.encrypt(ITEM_NAME, ENCRYPTION_VERSION)` in save_config()
new_config['General'] = {}
- new_config['General']['git_autoissues'] = int(GIT_AUTOISSUES)
new_config['General']['git_username'] = GIT_USERNAME
new_config['General']['git_password'] = helpers.encrypt(GIT_PASSWORD, ENCRYPTION_VERSION)
new_config['General']['git_reset'] = int(GIT_RESET)
diff --git a/sickbeard/logger.py b/sickbeard/logger.py
index 9fd753d15c4550ec0fcff5aa0bc8cb6a9563bc8e..2c20fc430a3ae8b51ca78dbc74ba6320bd949ad6 100644
--- a/sickbeard/logger.py
+++ b/sickbeard/logger.py
@@ -160,7 +160,7 @@ class Logger(object): # pylint: disable=too-many-instance-attributes
message = meThread + u" :: " + msg
# Change the SSL error to a warning with a link to information about how to fix it.
- check = re.sub(ur'error \[Errno 1\] _ssl.c:\d{3}: error:\d{8}:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert internal error', 'See: http://git.io/vJrkM', message)
+ check = re.sub(ur'error \[Errno 1\] _ssl.c:\d{3}: error:\d{8}:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert internal error', 'See: http://git.io/vuU5V', message)
if check != message:
message = check
level = WARNING
@@ -170,9 +170,6 @@ class Logger(object): # pylint: disable=too-many-instance-attributes
elif level == WARNING:
classes.WarningViewer.add(classes.UIError(message))
- # if sickbeard.GIT_AUTOISSUES:
- # self.submit_errors()
-
if level == ERROR:
self.logger.exception(message, *args, **kwargs)
else:
@@ -186,7 +183,7 @@ class Logger(object): # pylint: disable=too-many-instance-attributes
else:
sys.exit(1)
- def submit_errors(self): # Too many local variables, too many branches, pylint: disable=too-many-branches,too-many-locals
+ def submit_errors(self): # pylint: disable=too-many-branches,too-many-locals
submitter_result = u''
issue_id = None
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 413195c8f8bc5249109b7edfa459c604739bd44a..e88dc1e2501a69ca515ec0d214a1b1f5e5c3621e 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -1598,7 +1598,7 @@ class TVEpisode(object): # pylint: disable=too-many-instance-attributes, too-ma
logger.log(u"" + sickbeard.indexerApi(self.indexer).name + " threw up an error: " + ex(e), logger.DEBUG)
# if the episode is already valid just log it, if not throw it up
if self.name:
- logger.log(u"" + sickbeard.indexerApi(self.indexer).name
+ logger.log(u"" + sickbeard.indexerApi(self.indexer).name +
" timed out but we have enough info from other sources, allowing the error", logger.DEBUG)
return
else:
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index d160599662f044d4ab976191427316c251697533..e8ec5adb2d8215fb10942a90387d7680507a84f7 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -3755,7 +3755,7 @@ class ConfigGeneral(Config):
calendar_unprotected=None, calendar_icons=None, debug=None, ssl_verify=None, no_restart=None, coming_eps_missed_range=None,
fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None,
indexer_timeout=None, download_url=None, rootDir=None, theme_name=None, default_page=None,
- git_reset=None, git_username=None, git_password=None, git_autoissues=None, display_all_seasons=None):
+ git_reset=None, git_username=None, git_password=None, display_all_seasons=None):
results = []
@@ -3787,7 +3787,6 @@ class ConfigGeneral(Config):
# sickbeard.GIT_RESET = config.checkbox_to_value(git_reset)
# Force GIT_RESET
sickbeard.GIT_RESET = 1
- sickbeard.GIT_AUTOISSUES = config.checkbox_to_value(git_autoissues)
sickbeard.GIT_PATH = git_path
sickbeard.GIT_REMOTE = git_remote
sickbeard.CALENDAR_UNPROTECTED = config.checkbox_to_value(calendar_unprotected)
@@ -4516,8 +4515,8 @@ class ConfigProviders(Config):
provider_list = provider_list + disabled_list
# dynamically load provider settings
- for curTorrentProvider in [curProvider for curProvider in sickbeard.providers.sortedProviderList() if
- curProvider.provider_type == GenericProvider.TORRENT]:
+ for curTorrentProvider in [prov for prov in sickbeard.providers.sortedProviderList() if
+ prov.provider_type == GenericProvider.TORRENT]:
if hasattr(curTorrentProvider, 'custom_url'):
try:
@@ -4667,8 +4666,8 @@ class ConfigProviders(Config):
except Exception:
curTorrentProvider.subtitle = 0
- for curNzbProvider in [curProvider for curProvider in sickbeard.providers.sortedProviderList() if
- curProvider.provider_type == GenericProvider.NZB]:
+ for curNzbProvider in [prov for prov in sickbeard.providers.sortedProviderList() if
+ prov.provider_type == GenericProvider.NZB]:
if hasattr(curNzbProvider, 'api_key'):
try: