From 7c450b62143b5d4813639c79a9a68087182c38cc Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Thu, 12 Nov 2020 12:03:34 +0000 Subject: [PATCH] Moved piexif into captures submodule --- openflexure_microscope/captures/capture.py | 4 ++-- .../{camera => captures}/piexif/LICENSE.txt | 0 .../{camera => captures}/piexif/__init__.py | 0 openflexure_microscope/{camera => captures}/piexif/_common.py | 0 openflexure_microscope/{camera => captures}/piexif/_dump.py | 0 .../{camera => captures}/piexif/_exceptions.py | 0 openflexure_microscope/{camera => captures}/piexif/_exif.py | 0 openflexure_microscope/{camera => captures}/piexif/_insert.py | 0 openflexure_microscope/{camera => captures}/piexif/_load.py | 0 openflexure_microscope/{camera => captures}/piexif/_remove.py | 0 .../{camera => captures}/piexif/_transplant.py | 0 openflexure_microscope/{camera => captures}/piexif/_webp.py | 0 openflexure_microscope/{camera => captures}/piexif/helper.py | 0 13 files changed, 2 insertions(+), 2 deletions(-) rename openflexure_microscope/{camera => captures}/piexif/LICENSE.txt (100%) rename openflexure_microscope/{camera => captures}/piexif/__init__.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_common.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_dump.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_exceptions.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_exif.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_insert.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_load.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_remove.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_transplant.py (100%) rename openflexure_microscope/{camera => captures}/piexif/_webp.py (100%) rename openflexure_microscope/{camera => captures}/piexif/helper.py (100%) diff --git a/openflexure_microscope/captures/capture.py b/openflexure_microscope/captures/capture.py index 1e97c686..be5dd401 100644 --- a/openflexure_microscope/captures/capture.py +++ b/openflexure_microscope/captures/capture.py @@ -10,8 +10,8 @@ from PIL import Image import dateutil.parser -from openflexure_microscope.camera import piexif -from openflexure_microscope.camera.piexif._exceptions import InvalidImageDataError +from openflexure_microscope.captures import piexif +from openflexure_microscope.captures.piexif import InvalidImageDataError from openflexure_microscope.json import JSONEncoder EXIF_FORMATS = ["JPG", "JPEG", "TIF", "TIFF"] diff --git a/openflexure_microscope/camera/piexif/LICENSE.txt b/openflexure_microscope/captures/piexif/LICENSE.txt similarity index 100% rename from openflexure_microscope/camera/piexif/LICENSE.txt rename to openflexure_microscope/captures/piexif/LICENSE.txt diff --git a/openflexure_microscope/camera/piexif/__init__.py b/openflexure_microscope/captures/piexif/__init__.py similarity index 100% rename from openflexure_microscope/camera/piexif/__init__.py rename to openflexure_microscope/captures/piexif/__init__.py diff --git a/openflexure_microscope/camera/piexif/_common.py b/openflexure_microscope/captures/piexif/_common.py similarity index 100% rename from openflexure_microscope/camera/piexif/_common.py rename to openflexure_microscope/captures/piexif/_common.py diff --git a/openflexure_microscope/camera/piexif/_dump.py b/openflexure_microscope/captures/piexif/_dump.py similarity index 100% rename from openflexure_microscope/camera/piexif/_dump.py rename to openflexure_microscope/captures/piexif/_dump.py diff --git a/openflexure_microscope/camera/piexif/_exceptions.py b/openflexure_microscope/captures/piexif/_exceptions.py similarity index 100% rename from openflexure_microscope/camera/piexif/_exceptions.py rename to openflexure_microscope/captures/piexif/_exceptions.py diff --git a/openflexure_microscope/camera/piexif/_exif.py b/openflexure_microscope/captures/piexif/_exif.py similarity index 100% rename from openflexure_microscope/camera/piexif/_exif.py rename to openflexure_microscope/captures/piexif/_exif.py diff --git a/openflexure_microscope/camera/piexif/_insert.py b/openflexure_microscope/captures/piexif/_insert.py similarity index 100% rename from openflexure_microscope/camera/piexif/_insert.py rename to openflexure_microscope/captures/piexif/_insert.py diff --git a/openflexure_microscope/camera/piexif/_load.py b/openflexure_microscope/captures/piexif/_load.py similarity index 100% rename from openflexure_microscope/camera/piexif/_load.py rename to openflexure_microscope/captures/piexif/_load.py diff --git a/openflexure_microscope/camera/piexif/_remove.py b/openflexure_microscope/captures/piexif/_remove.py similarity index 100% rename from openflexure_microscope/camera/piexif/_remove.py rename to openflexure_microscope/captures/piexif/_remove.py diff --git a/openflexure_microscope/camera/piexif/_transplant.py b/openflexure_microscope/captures/piexif/_transplant.py similarity index 100% rename from openflexure_microscope/camera/piexif/_transplant.py rename to openflexure_microscope/captures/piexif/_transplant.py diff --git a/openflexure_microscope/camera/piexif/_webp.py b/openflexure_microscope/captures/piexif/_webp.py similarity index 100% rename from openflexure_microscope/camera/piexif/_webp.py rename to openflexure_microscope/captures/piexif/_webp.py diff --git a/openflexure_microscope/camera/piexif/helper.py b/openflexure_microscope/captures/piexif/helper.py similarity index 100% rename from openflexure_microscope/camera/piexif/helper.py rename to openflexure_microscope/captures/piexif/helper.py