Raise minimum required Python version to 3.6

doc/developers_guide.rst

@@ -46,17 +46,13 @@ Setup
 ::
 
     pip install pytest
-    pip install mock
 
 
 rospkg uses `pytest <http://docs.pytest.org>`_ 
 for testing, which is a fairly simple and straightfoward test
 framework.  You just have to write a function start with the name
 ``test`` and use normal ``assert`` statements for your tests.
 
-rospkg also uses `mock <http://www.voidspace.org.uk/python/mock/>`_ to
-create mocks for testing.
-
 You can run the tests, including coverage, as follows:
 
 ::

setup.py

@@ -26,7 +26,6 @@
     'install_requires': install_requires,
     'extras_require': {
         'test': [
-            "mock; python_version < '3.3'",
             'pytest',
         ]},
     'author': 'Ken Conley',
@@ -43,6 +42,7 @@
     'classifiers': [
         'Programming Language :: Python',
         'License :: OSI Approved :: BSD License'],
+    'python_requires': '>=3.6',
     'description': 'ROS package library',
     'long_description': """\
         Library for retrieving information about ROS packages and stacks.

src/rospkg/manifest.py

@@ -433,9 +433,7 @@ def parse_manifest_file(dirpath, manifest_name, rospack=None):
         return manifest
 
     with open(filename, 'rb') as f:
-        data = f.read()
-    if sys.version_info[0] >= 3:
-        data = data.decode('utf-8')
+        data = f.read().decode('utf-8')
     return parse_manifest(manifest_name, data, filename)
 
 

src/rospkg/os_detect.py

@@ -32,9 +32,6 @@
 Linux distributions.
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import codecs
 # to be removed after Ubuntu Xenial is out of support
 import sys

src/rospkg/rosversion.py

@@ -25,8 +25,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 import argparse
 import os
 import sys

stdeb.cfg

@@ -13,7 +13,7 @@ Conflicts3: python-rospkg
 Suite: bionic buster
 Suite3: focal jammy noble bookworm trixie
 Python2-Depends-Name: python
-X-Python3-Version: >= 3.4
+X-Python3-Version: >= 3.6
 Setup-Env-Vars: SKIP_PYTHON_MODULES=1
 
 [rospkg_modules]
@@ -26,5 +26,5 @@ Replaces3: python3-rospkg (<< 1.1.0)
 Suite: bionic buster
 Suite3: focal jammy noble bookworm trixie
 Python2-Depends-Name: python
-X-Python3-Version: >= 3.4
+X-Python3-Version: >= 3.6
 Setup-Env-Vars: SKIP_PYTHON_SCRIPTS=1

test/test_rospkg_catkin_packages.py

@@ -30,8 +30,6 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 import os
 
 import rospkg

test/test_rospkg_common.py

@@ -30,8 +30,6 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 
 def test_ResourceNotFound():
     from rospkg import ResourceNotFound

test/test_rospkg_manifest.py

@@ -31,8 +31,6 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 import os
 
 

test/test_rospkg_os_detect.py

@@ -30,15 +30,9 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
-
 import os
 import sys
-
-try:
-    from unittest.mock import Mock, patch
-except ImportError:
-    from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 
 class TrueOs():

test/test_rospkg_packages.py

@@ -30,8 +30,6 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 import os
 import subprocess
 import tempfile

test/test_rospkg_stacks.py

@@ -30,10 +30,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 import os
-
 import subprocess