moved utils.error module to errors

tikuma-lsuhsc · tikuma-lsuhsc · commit ebcdc99776ff · 2022-10-04T08:25:40.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,7 +26,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - `configure.build_basic_vf()` to use `filtergraph.Graph` and can be appended to user specified `vf`
 - `analyze` module, updated to use `filtergraph.Graph`
 - `analyze.MetadataLogger`: changed `filter_spec` property to `filter` to return a `Filter` object
-
+- moved `utils.error` module to `errors`
+- 
 ### Fixed
 
 - `caps.filters()` - fixed reporting incorrect # of pads for source and sink filters
diff --git a/src/ffmpegio/__init__.py b/src/ffmpegio/__init__.py
@@ -47,7 +47,7 @@ def __getattr__(name):
 
 from . import ffmpegprocess
 
-from .utils.error import FFmpegError
+from .errors import FFmpegError
 from .utils.concat import FFConcat
 from .filtergraph import Graph as FilterGraph
 from . import devices, ffmpegprocess, caps, probe, audio, image, video, media
diff --git a/src/ffmpegio/analyze.py b/src/ffmpegio/analyze.py
@@ -8,7 +8,7 @@
 from . import configure
 from .filtergraph import Graph, Filter, Chain, as_filtergraph
 from .utils.filter import compose_filter
-from .utils.error import FFmpegError
+from .errors import FFmpegError
 from .path import devnull
 from . import ffmpegprocess as fp
 import re
diff --git a/src/ffmpegio/caps.py b/src/ffmpegio/caps.py
@@ -7,7 +7,7 @@
 from functools import partial
 
 from .path import where
-from .utils.error import FFmpegError
+from .errors import FFmpegError
 
 # fmt:off
 __all__ = ["options", "filters", "codecs", "coders", "formats", "devices",
diff --git a/src/ffmpegio/configure.py b/src/ffmpegio/configure.py
@@ -2,7 +2,7 @@
 
 from . import utils, plugins
 from .filtergraph import Graph, Filter, Chain
-from .utils.error import FFmpegioError
+from .errors import FFmpegioError
 
 
 def array_to_video_input(rate, data, stream_id=None, **opts):
diff --git a/src/ffmpegio/errors.py b/src/ffmpegio/errors.py
diff --git a/src/ffmpegio/filtergraph.py b/src/ffmpegio/filtergraph.py
@@ -105,7 +105,7 @@
 from .caps import filters as list_filters, filter_info, layouts
 from .utils import filter as filter_utils, is_stream_spec
 from .utils.fglinks import FilterGraphLinks
-from .utils.error import FFmpegioError
+from .errors import FFmpegioError
 
 
 class FilterOperatorTypeError(TypeError, FFmpegioError):
diff --git a/src/ffmpegio/threading.py b/src/ffmpegio/threading.py
@@ -12,7 +12,7 @@
 
 from .utils.avi import AviReader
 from .utils.log import extract_output_stream as _extract_output_stream
-from .utils.error import FFmpegError
+from .errors import FFmpegError
 
 # fmt:off
 __all__ = ['AviReader', 'FFmpegError', 'ThreadNotActive', 'ProgressMonitorThread',
diff --git a/src/ffmpegio/utils/fglinks.py b/src/ffmpegio/utils/fglinks.py
@@ -1,7 +1,7 @@
 import re
 from collections import UserDict, abc
 from . import is_stream_spec
-from .error import FFmpegioError
+from ..errors import FFmpegioError
 
 
 FilterPadId = tuple[int, int, int]
