Merge pull request #70 from deronnax/pyupgrade

remove python2 leftovers

dparse/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
 """Top-level package for Dependency Parser."""
 
 __author__ = """Jannis Gebauer"""

dparse/dependencies.py

@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
-
 import json
 from json import JSONEncoder
 
 from . import filetypes, errors
 
 
-class Dependency(object):
+class Dependency:
     """
 
     """
@@ -102,7 +99,7 @@ def default(self, o):
         return JSONEncoder.default(self, o)
 
 
-class DependencyFile(object):
+class DependencyFile:
     """
 
     """

dparse/errors.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
-
-
 class UnknownDependencyFileError(Exception):
     """
 

dparse/filetypes.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
-
 requirements_txt = "requirements.txt"
 conda_yml = "conda.yml"
 setup_cfg = "setup.cfg"

dparse/parser.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
-
 import os
 from collections import OrderedDict
 import re
@@ -80,7 +77,7 @@ def yield_lines(strs):
         yield PackagingRequirement(line)
 
 
-class RequirementsTXTLineParser(object):
+class RequirementsTXTLineParser:
     """
 
     """
@@ -112,7 +109,7 @@ def parse(cls, line):
         return dep
 
 
-class Parser(object):
+class Parser:
     """
 
     """
@@ -132,8 +129,7 @@ def iter_lines(self, lineno=0):
         :param lineno:
         :return:
         """
-        for line in self.lines[lineno:]:
-            yield line
+        yield from self.lines[lineno:]
 
     @property
     def lines(self):
@@ -241,7 +237,7 @@ def parse(self):
                 req_file_path = self.resolve_file(self.obj.path, line)
 
                 if self.resolve and os.path.exists(req_file_path):
-                    with open(req_file_path, 'r') as f:
+                    with open(req_file_path) as f:
                         content = f.read()
 
                         dep_file = DependencyFile(

dparse/regex.py

@@ -1,4 +1 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
 HASH_REGEX = r"--hash[=| ]\w+:\w+"

dparse/updater.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
 import re
 import json
 import tempfile
@@ -12,7 +10,7 @@
     import tomli as tomllib
 
 
-class RequirementsTXTUpdater(object):
+class RequirementsTXTUpdater:
     SUB_REGEX = r"^{}(?=\s*\r?\n?$)"
 
     @classmethod
@@ -81,7 +79,7 @@ class SetupCFGUpdater(CondaYMLUpdater):
     pass
 
 
-class PipfileUpdater(object):
+class PipfileUpdater:
     @classmethod
     def update(cls, content, dependency, version, spec="==", hashes=()):
         data = tomllib.loads(content)
@@ -107,7 +105,7 @@ def update(cls, content, dependency, version, spec="==", hashes=()):
         return data
 
 
-class PipfileLockUpdater(object):
+class PipfileLockUpdater:
     @classmethod
     def update(cls, content, dependency, version, spec="==", hashes=()):
         data = json.loads(content)

tests/__init__.py

@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
 """Unit test package for dparse."""

tests/test_dependencies.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
 """Tests for `dparse.dependencies`"""
 
 import pytest

tests/test_parse.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 import sys
 from pathlib import PurePath

tests/test_updater.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """Tests for `dparse.updater`"""