From 13e9fd9b10395a4f7794f8623613151965252182 Mon Sep 17 00:00:00 2001
From: Michael Lazar <michael.lazar.ctr@dren.hpc.mil>
Date: Tue, 28 Mar 2017 23:18:13 -0700
Subject: [PATCH] A couple of pylint changes

---
 rtv/__main__.py | 4 ++--
 rtv/content.py  | 2 +-
 rtv/objects.py  | 1 -
 rtv/page.py     | 2 +-
 rtv/terminal.py | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/rtv/__main__.py b/rtv/__main__.py
index 6f21087..4fd9a01 100644
--- a/rtv/__main__.py
+++ b/rtv/__main__.py
@@ -115,10 +115,10 @@ def main():
     # Check the praw version
     if packages.__praw_bundled__:
         _logger.info('Using packaged PRAW distribution, '
-                     'commit %s' % packages.__praw_hash__)
+                     'commit %s', packages.__praw_hash__)
     else:
         _logger.info('Packaged PRAW not found, falling back to system '
-                     'installed version %s' % praw.__version__)
+                     'installed version %s', praw.__version__)
 
     # Construct the reddit user agent
     user_agent = docs.AGENT.format(version=__version__)
diff --git a/rtv/content.py b/rtv/content.py
index 3551410..f7f5471 100644
--- a/rtv/content.py
+++ b/rtv/content.py
@@ -341,7 +341,7 @@ class SubmissionContent(Content):
         url = url.replace('https://np.', 'https://www.')
         submission = reddit.get_submission(url, comment_sort=order)
         return cls(submission, loader, indent_size, max_indent_level, order,
-            max_comment_cols)
+                   max_comment_cols)
 
     @property
     def range(self):
diff --git a/rtv/objects.py b/rtv/objects.py
index 0ac79eb..b6a42a1 100644
--- a/rtv/objects.py
+++ b/rtv/objects.py
@@ -58,7 +58,6 @@ def curses_session():
             curses.start_color()
         except:
             _logger.warning('Curses failed to initialize color support')
-            pass
 
         # Hide the blinking cursor
         try:
diff --git a/rtv/page.py b/rtv/page.py
index f3dd17a..1d400d1 100644
--- a/rtv/page.py
+++ b/rtv/page.py
@@ -3,11 +3,11 @@ from __future__ import unicode_literals
 
 import os
 import sys
-import six
 import time
 import curses
 from functools import wraps
 
+import six
 from kitchen.text.display import textual_width
 
 from . import docs
diff --git a/rtv/terminal.py b/rtv/terminal.py
index e6cfc48..b013584 100644
--- a/rtv/terminal.py
+++ b/rtv/terminal.py
@@ -426,7 +426,7 @@ class Terminal(object):
                 except Exception as e:
                     # If Imgur decides to change its html layout, let it fail
                     # silently in the background instead of crashing.
-                    _logger.warn('parser %s raised an exception', parser)
+                    _logger.warning('parser %s raised an exception', parser)
                     _logger.exception(e)
                     raise exceptions.MailcapEntryNotFound()
                 if not content_type: