Merge remote-tracking branch 'satreix/pep-e262' into develop

This commit is contained in:
rembo10
2016-04-05 12:01:34 +01:00
2 changed files with 2 additions and 3 deletions

3
.pep8
View File

@@ -7,8 +7,7 @@
# E127 continuation line over-indented for visual indent
# E128 continuation line under-indented for visual indent
# E261 at least two spaces before inline comment
# E262 inline comment should start with '# '
# E265 block comment should start with '# '
# E501 line too long (312 > 160 characters)
ignore = E121,E122,E123,E124,E125,E126,E127,E128,E261,E262,E265,E501
ignore = E121,E122,E123,E124,E125,E126,E127,E128,E261,E265,E501
max-line-length = 160

View File

@@ -1779,7 +1779,7 @@ def preprocess(resultlist):
return ruobj.get_torrent_data(result[2]), result
# Get out of here if we're using Transmission
if headphones.CONFIG.TORRENT_DOWNLOADER == 1: ## if not a magnet link still need the .torrent to generate hash... uTorrent support labeling
if headphones.CONFIG.TORRENT_DOWNLOADER == 1: # if not a magnet link still need the .torrent to generate hash... uTorrent support labeling
return True, result
# Get out of here if it's a magnet link
if result[2].lower().startswith("magnet:"):