From 52760e40005edd0d96a64906ce7f2dccd4ecaa16 Mon Sep 17 00:00:00 2001
From: Michael Lazar <lazar.michael22@gmail.com>
Date: Tue, 15 Dec 2015 00:15:20 -0800
Subject: [PATCH] Updated package data, pylint fix.

---
 rtv/config.py        | 7 ++++---
 setup.py             | 2 +-
 tests/test_config.py | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rtv/config.py b/rtv/config.py
index 0360a9d..29e105a 100644
--- a/rtv/config.py
+++ b/rtv/config.py
@@ -7,11 +7,11 @@ import shutil
 import argparse
 from functools import partial
 
-from six.moves import configparser, input
+import six
+from six.moves import configparser
 
 from . import docs, __version__
 
-
 PACKAGE = os.path.dirname(__file__)
 HOME = os.path.expanduser('~')
 TEMPLATE = os.path.join(PACKAGE, 'templates')
@@ -65,7 +65,8 @@ def copy_default_config(filename=CONFIG):
 
     if os.path.exists(filename):
         try:
-            ch = input('File %s already exists, overwrite? y/[n]):' % filename)
+            ch = six.moves.input(
+                'File %s already exists, overwrite? y/[n]):' % filename)
             if ch not in ('Y', 'y'):
                 return
         except KeyboardInterrupt:
diff --git a/setup.py b/setup.py
index 3819d20..d7eeec6 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ setuptools.setup(
     license='MIT',
     keywords='reddit terminal praw curses',
     packages=['rtv'],
-    package_data={'rtv': ['templates/index.html']},
+    package_data={'rtv': ['templates/*', 'rtv.cfg']},
     data_files=[("share/man/man1", ["rtv.1"])],
     extras_require={
         ':python_version=="2.6" or python_version=="2.7"': ['futures']},
diff --git a/tests/test_config.py b/tests/test_config.py
index d458778..734a592 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -17,10 +17,9 @@ def test_copy_default_config():
     "Make sure the default config file was included in the package"
 
     with NamedTemporaryFile(suffix='.cfg') as fp:
-        with mock.patch('rtv.config.input', return_value='y'):
+        with mock.patch('rtv.config.six.moves.input', return_value='y'):
             copy_default_config(fp.name)
-            with open(DEFAULT_CONFIG) as fp_default:
-                assert fp.read() == fp_default.read()
+            assert fp.read()
             permissions = os.stat(fp.name).st_mode & 0o777
             assert permissions == 0o664