From c5c7b7d5649cab6b4066f0a0727e98cb9d461e78 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Tue, 15 Oct 2024 16:59:29 -0400 Subject: [PATCH] Drop Python 2 Unicode handling --- bagit.py | 13 ------------- test.py | 11 ----------- 2 files changed, 24 deletions(-) diff --git a/bagit.py b/bagit.py index 662d4c5..944bf94 100755 --- a/bagit.py +++ b/bagit.py @@ -1438,19 +1438,6 @@ def _decode_filename(s): return s -def force_unicode_py2(s): - """Reliably return a Unicode string given a possible unicode or byte string""" - if isinstance(s, str): - return s.decode("utf-8") - else: - return unicode(s) - - -if sys.version_info > (3, 0): - force_unicode = str -else: - force_unicode = force_unicode_py2 - # following code is used for command line program diff --git a/test.py b/test.py index 0f32754..b5b4252 100644 --- a/test.py +++ b/test.py @@ -1285,16 +1285,5 @@ def test_create_bag(self): self.assertEqual(cm.exception.code, 0) -class TestUtils(unittest.TestCase): - def test_force_unicode_str_to_unicode(self): - self.assertIsInstance(bagit.force_unicode("foobar"), str) - - def test_force_unicode_pass_through(self): - self.assertIsInstance(bagit.force_unicode("foobar"), str) - - def test_force_unicode_int(self): - self.assertIsInstance(bagit.force_unicode(1234), str) - - if __name__ == "__main__": unittest.main()