PEP8 (a run of lint.sh)

nyaa/forms.py

@@ -209,7 +209,7 @@ class UploadForm(FlaskForm):
         # Decode and ensure data is bencoded data
         try:
             torrent_dict = bencode.decode(field.data)
-            #field.data.close()
+            # field.data.close()
         except (bencode.MalformedBencodeException, UnicodeError):
             raise ValidationError('Malformed torrent file')
 
@@ -266,7 +266,12 @@ class TorrentFileData(object):
 
 # https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure
 
+<<<<<<< master
 def _validate_trackers(torrent_dict, tracker_to_check_for=None):
+=======
+
+def _validate_trackers(torrent_dict):
+>>>>>>> PEP8 (a run of lint.sh)
     announce = torrent_dict.get('announce')
     announce_string = _validate_bytes(announce, 'announce', 'utf-8')