From 2728f2e7a404754c31941a2c29d2956a0e32aeea Mon Sep 17 00:00:00 2001
From: Mark Mayo <mark@there.co.nz>
Date: Fri, 25 Nov 2022 00:17:48 +1100
Subject: [PATCH] update deprecated warn(), py 3 strings, whitespace

tests all pass (eventually)
---
 docs/conf.py          | 16 ++++++++--------
 pipreqs/pipreqs.py    |  4 ++--
 tests/test_pipreqs.py |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 2cbd667..e50b6ac 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -55,8 +55,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'pipreqs'
-copyright = u'2015, Vadim Kravcenko'
+project = 'pipreqs'
+copyright = '2015, Vadim Kravcenko'
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -209,8 +209,8 @@ latex_elements = {
 # [howto/manual]).
 latex_documents = [
     ('index', 'pipreqs.tex',
-     u'pipreqs Documentation',
-     u'Vadim Kravcenko', 'manual'),
+     'pipreqs Documentation',
+     'Vadim Kravcenko', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at
@@ -240,8 +240,8 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'pipreqs',
-     u'pipreqs Documentation',
-     [u'Vadim Kravcenko'], 1)
+     'pipreqs Documentation',
+     ['Vadim Kravcenko'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -255,8 +255,8 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'pipreqs',
-     u'pipreqs Documentation',
-     u'Vadim Kravcenko',
+     'pipreqs Documentation',
+     'Vadim Kravcenko',
      'pipreqs',
      'One line description of project.',
      'Miscellaneous'),
diff --git a/pipreqs/pipreqs.py b/pipreqs/pipreqs.py
index 24eeeb7..001063d 100644
--- a/pipreqs/pipreqs.py
+++ b/pipreqs/pipreqs.py
@@ -124,7 +124,7 @@ def get_all_imports(
             except Exception as exc:
                 if ignore_errors:
                     traceback.print_exc(exc)
-                    logging.warn("Failed on file: %s" % file_name)
+                    logging.warning("Failed on file: %s" % file_name)
                     continue
                 else:
                     logging.error("Failed on file: %s" % file_name)
@@ -206,7 +206,7 @@ def get_locally_installed_packages(encoding=None):
                         package = root.split(os.sep)[-1].split("-")
                         try:
                             package_import = f.read().strip().split("\n")
-                        except:  # NOQA
+                        except Exception:  # NOQA
                             # TODO: What errors do we intend to suppress here?
                             continue
                         for i_item in package_import:
diff --git a/tests/test_pipreqs.py b/tests/test_pipreqs.py
index f82d3db..27ef49a 100644
--- a/tests/test_pipreqs.py
+++ b/tests/test_pipreqs.py
@@ -145,7 +145,7 @@ class TestPipreqs(unittest.TestCase):
         Test that we can save requirements.txt correctly
         to a different path
         """
-        pipreqs.init({'<path>': self.project, '--savepath': self.alt_requirement_path, 
+        pipreqs.init({'<path>': self.project, '--savepath': self.alt_requirement_path,
                       '--use-local': None, '--proxy':None, '--pypi-server':None,  '--print': False,
                       '--diff': None, '--clean': None, '--mode': None})
         assert os.path.exists(self.alt_requirement_path) == 1
@@ -163,7 +163,7 @@ class TestPipreqs(unittest.TestCase):
         """
         with open(self.requirements_path, "w") as f:
             f.write("should_not_be_overwritten")
-        pipreqs.init({'<path>': self.project, '--savepath': None, '--use-local': None, 
+        pipreqs.init({'<path>': self.project, '--savepath': None, '--use-local': None,
                       '--force': None, '--proxy':None, '--pypi-server':None, '--print': False,
                       '--diff': None, '--clean': None, '--mode': None})
         assert os.path.exists(self.requirements_path) == 1
@@ -203,7 +203,7 @@ class TestPipreqs(unittest.TestCase):
         Test --ignore parameter
         """
         pipreqs.init(
-            {'<path>': self.project_with_ignore_directory, '--savepath': None, 
+            {'<path>': self.project_with_ignore_directory, '--savepath': None,
                       '--print': False, '--use-local': None, '--force': True,
                       '--proxy':None, '--pypi-server':None,
                       '--ignore':'.ignored_dir,.ignore_second',
@@ -222,7 +222,7 @@ class TestPipreqs(unittest.TestCase):
         Test --mode=no-pin
         """
         pipreqs.init(
-            {'<path>': self.project_with_ignore_directory, '--savepath': None, 
+            {'<path>': self.project_with_ignore_directory, '--savepath': None,
              '--print': False, '--use-local': None, '--force': True,
              '--proxy': None, '--pypi-server': None,
              '--diff': None,