IPTCInfo3 2.2.0__tar.gz → 2.3.1__tar.gz

{iptcinfo3-2.2.0 → iptcinfo3-2.3.1}/.gitignore

@@ -19,3 +19,6 @@ __pycache__
 
 # pipfile stuff
 Pipfile.lock
+
+# virtualenvs
+.venv/

{iptcinfo3-2.2.0 → iptcinfo3-2.3.1}/CHANGELOG.md

@@ -1,3 +1,33 @@
+## 2.3.1
+
+### Compatibility
+- Verified on Python 3.15 (all 8 tests pass); supports Python 3.10 through 3.15
+- Dropped EOL interpreters: 3.8 (EOL Oct 2024) and 3.9 (EOL Oct 2025); `requires-python` is now `>=3.10`
+- Added PyPI classifiers for Python 3.14 and 3.15
+
+### Bug Fixes
+- Fixed `SyntaxWarning: 'return' in a 'finally' block` in `file_is_jpeg()` (return moved out of `finally`; behavior unchanged, file position still reset)
+
+### Build / Dev
+- Fixed `pytest` config: `testpaths` pointed at a non-existent `tests/` dir so bare `pytest` collected nothing; now points at repo root so `iptcinfo_test.py` is found
+- Bumped Ruff `target-version` from `py38` to `py310`
+- Updated dev pins: `.python-version` 3.9.7 → 3.15, `Pipfile` requires 3.10, CircleCI image `cimg/python:3.9.7` → `cimg/python:3.15`
+- Added GitHub Actions CI matrix (Python 3.10–3.15)
+
+---
+
+## 2.3.0 (2025-12-02)
+
+### Bug Fixes
+- **Issue #50**: Fixed keywords and other list fields to prevent duplicate values (deduplicates on append and save)
+- **Issue #45**: Removed outdated VERSION = 1.9 comment from code
+
+### New Features
+- **Issue #44**: Added LICENSE file with dual Artistic-1.0 / GPL-1.0+ license
+- Added `UniqueList` class for list fields that automatically prevents duplicates
+
+---
+
 ## 2.2.0 (2025-10-02)
 
 ### Bug Fixes
@@ -15,6 +45,13 @@
 - **Issue #38**: Verified backup file behavior (use `options={'overwrite': True}` to avoid ~ files)
 - Better error handling and logging throughout
 
+### Build System Modernization
+- Migrated from legacy `setup.py` to modern `pyproject.toml`
+- Now uses `uv` and `hatchling` for building (PEP 517/518 compliant)
+- Simplified setup.py to minimal backward compatibility shim
+- Added comprehensive publishing guide (`PUBLISHING.md`)
+- Supports Python 3.8 through 3.13
+
 ### Notes
 - **Issue #39, #41**: Ready for PyPI release with all fixes from master branch
 

iptcinfo3-2.3.1/LICENSE

@@ -0,0 +1,20 @@
+IPTCInfo3 - IPTC metadata extraction and modification for Python
+
+Copyright (C) 2000-2004 Josh Carter <josh@multipart-mixed.com>
+Copyright (C) 2004-2008 Tamas Gulacsi <gthomas@gthomas.hu>
+Copyright (C) 2008-2025 James Campbell
+
+DUAL LICENSE
+
+This software is dual-licensed. You may choose either:
+
+1. The Artistic License 1.0
+   https://opensource.org/licenses/Artistic-1.0
+
+2. The GNU General Public License v1.0 or later
+   https://www.gnu.org/licenses/old-licenses/gpl-1.0.en.html
+
+You may use, modify, and distribute this software under the terms of
+either license, at your option.
+
+Full license texts available at the URLs above.

{iptcinfo3-2.2.0 → iptcinfo3-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: IPTCInfo3
-Version: 2.2.0
+Version: 2.3.1
 Summary: Extract and modify IPTC metadata from JPEG images
 Project-URL: Homepage, https://github.com/jamesacampbell/iptcinfo3
 Project-URL: Repository, https://github.com/jamesacampbell/iptcinfo3
@@ -8,6 +8,7 @@ Project-URL: Issues, https://github.com/jamesacampbell/iptcinfo3/issues
 Author-email: Tamas Gulacsi <gthomas@fw.hu>
 Maintainer-email: James Campbell <jc@normail.co>
 License: Artistic-1.0 OR GPL-1.0-or-later
+License-File: LICENSE
 Keywords: exif,iptc,jpeg,metadata,photography
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -15,15 +16,15 @@ Classifier: License :: OSI Approved :: Artistic License
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Multimedia :: Graphics
 Classifier: Topic :: Utilities
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Provides-Extra: dev
 Requires-Dist: pytest-cov>=4.0; extra == 'dev'
 Requires-Dist: pytest-watch>=4.2; extra == 'dev'
@@ -33,8 +34,6 @@ Description-Content-Type: text/x-rst
 ``IPTCINFO 3``
 ==============
 
-`Build Status <https://api.travis-ci.org/crccheck/iptcinfo3.png>`_
-
 Like IPTCInfo but finally compatible for Python 3
 -------------------------------------------------
 
@@ -43,7 +42,7 @@ Ported from Josh Carter's Perl IPTCInfo-1.9.pm by Tamas Gulacsi
 
 Ever wish you add information to your photos like a caption, the place
 you took it, the date, and perhaps even keywords and categories? You
-already can. The International Press Telecommunications Council (IPTC)
+already can. The `International Press Telecommunications Council (IPTC) <https://en.wikipedia.org/wiki/International_Press_Telecommunications_Council>`_
 defines a format for exchanging meta-information in news content, and
 that includes photographs. You can embed all kinds of information in
 your images. The trick is putting it to use.
@@ -55,6 +54,27 @@ programs -- pull it back out. You can use the information directly in
 Python programs, export it to XML, or even export SQL statements ready
 to be fed into a database.
 
+Wikidata item https://www.wikidata.org/wiki/Q137179516
+
+Installation
+------------
+
+Install from PyPI::
+
+    pip install IPTCInfo3
+
+Or with uv::
+
+    uv pip install IPTCInfo3
+
+On Gentoo Linux: on `gentoo-zh overlay <https://github.com/microcai/gentoo-zh/tree/master/dev-python/iptcinfo3>`_.
+
+Requirements
+------------
+
+- Python 3.10 or higher
+- No external dependencies required
+
 Usage
 -----
 
@@ -85,3 +105,5 @@ Lists for keywords, so you can just append!
 Save new info to file
 ``info.save()``
 ``info.save_as('very_meta.jpg')``
+
+For real life usage example see https://gitlab.com/vitaly-zdanevich/upload_to_commons_with_categories_from_iptc/-/blob/master/upload_to_commons_with_categories_from_iptc.py

{iptcinfo3-2.2.0 → iptcinfo3-2.3.1}/README.rst

@@ -1,8 +1,6 @@
 ``IPTCINFO 3``
 ==============
 
-`Build Status <https://api.travis-ci.org/crccheck/iptcinfo3.png>`_
-
 Like IPTCInfo but finally compatible for Python 3
 -------------------------------------------------
 
@@ -11,7 +9,7 @@ Ported from Josh Carter's Perl IPTCInfo-1.9.pm by Tamas Gulacsi
 
 Ever wish you add information to your photos like a caption, the place
 you took it, the date, and perhaps even keywords and categories? You
-already can. The International Press Telecommunications Council (IPTC)
+already can. The `International Press Telecommunications Council (IPTC) <https://en.wikipedia.org/wiki/International_Press_Telecommunications_Council>`_
 defines a format for exchanging meta-information in news content, and
 that includes photographs. You can embed all kinds of information in
 your images. The trick is putting it to use.
@@ -23,6 +21,27 @@ programs -- pull it back out. You can use the information directly in
 Python programs, export it to XML, or even export SQL statements ready
 to be fed into a database.
 
+Wikidata item https://www.wikidata.org/wiki/Q137179516
+
+Installation
+------------
+
+Install from PyPI::
+
+    pip install IPTCInfo3
+
+Or with uv::
+
+    uv pip install IPTCInfo3
+
+On Gentoo Linux: on `gentoo-zh overlay <https://github.com/microcai/gentoo-zh/tree/master/dev-python/iptcinfo3>`_.
+
+Requirements
+------------
+
+- Python 3.10 or higher
+- No external dependencies required
+
 Usage
 -----
 
@@ -53,3 +72,5 @@ Lists for keywords, so you can just append!
 Save new info to file
 ``info.save()``
 ``info.save_as('very_meta.jpg')``
+
+For real life usage example see https://gitlab.com/vitaly-zdanevich/upload_to_commons_with_categories_from_iptc/-/blob/master/upload_to_commons_with_categories_from_iptc.py

{iptcinfo3-2.2.0 → iptcinfo3-2.3.1}/iptcinfo3.py

@@ -14,7 +14,6 @@
 # it under the terms of the Artistic License or the GNU General Public
 # License (GPL). You may choose either license.
 #
-# VERSION = '1.9';
 """
 IPTCInfo - Python module for extracting and modifying IPTC image meta-data
 """
@@ -27,7 +26,7 @@ import tempfile
 from struct import pack, unpack
 import json
 
-__version__ = '2.2.0'
+__version__ = '2.3.1'
 __author__ = 'Gulácsi, Tamás'
 __updated_by__ = 'Campbell, James'
 
@@ -163,7 +162,7 @@ def file_is_jpeg(fh):
             ered = ff == 0xff
     finally:
         fh.seek(0)
-        return ered
+    return ered
 
 
 def jpeg_get_variable_length(fh):
@@ -524,6 +523,17 @@ c_charset = {100: 'iso8859_1', 101: 'iso8859_2', 109: 'iso8859_3',
 c_charset_r = {v: k for k, v in c_charset.items()}
 
 
+class UniqueList(list):
+    """A list that prevents duplicate values on append/extend."""
+    def append(self, value):
+        if value not in self:
+            super().append(value)
+
+    def extend(self, values):
+        for v in values:
+            self.append(v)
+
+
 class IPTCData(dict):
     """Dict with int/string keys from c_listdatanames"""
     def __init__(self, diction={}, *args, **kwds):
@@ -608,9 +618,9 @@ class IPTCInfo:
 
     def __init__(self, fobj, force=False, inp_charset=None, out_charset=None):
         self._data = IPTCData({
-            'supplemental category': [],
-            'keywords': [],
-            'contact': [],
+            'supplemental category': UniqueList(),
+            'keywords': UniqueList(),
+            'contact': UniqueList(),
         })
         self._fobj = fobj
         self._force = force
@@ -956,10 +966,11 @@ class IPTCInfo:
                 out.append(pack("!BBBH", tag, record, dataset, len(value)))
                 out.append(value)
             else:
+                seen = set()
                 for v in map(bytes, value):
-                    if v is None or len(v) == 0:
+                    if v is None or len(v) == 0 or v in seen:
                         continue
-
+                    seen.add(v)
                     out.append(pack("!BBBH", tag, record, dataset, len(v)))
                     out.append(v)
 

{iptcinfo3-2.2.0 → iptcinfo3-2.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "IPTCInfo3"
-version = "2.2.0"
+version = "2.3.1"
 description = "Extract and modify IPTC metadata from JPEG images"
 readme = "README.rst"
 license = { text = "Artistic-1.0 OR GPL-1.0-or-later" }
@@ -22,16 +22,16 @@ classifiers = [
     "Intended Audience :: Developers",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Topic :: Multimedia :: Graphics",
     "Topic :: Utilities",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = []
 
 [project.urls]
@@ -59,7 +59,7 @@ packages = ["."]
 only-include = ["iptcinfo3.py"]
 
 [tool.pytest.ini_options]
-testpaths = ["tests"]
+testpaths = ["."]
 python_files = ["test_*.py", "*_test.py"]
 
 [tool.coverage.run]
@@ -72,7 +72,7 @@ skip_covered = true
 
 [tool.ruff]
 line-length = 100
-target-version = "py38"
+target-version = "py310"
 
 [tool.ruff.lint]
 select = ["E", "F", "W", "I", "N", "UP"]