aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormorefigs <morefigs@gmail.com>2018-06-22 15:59:49 +1000
committermorefigs <morefigs@gmail.com>2018-06-22 15:59:49 +1000
commitfac2f7b87ebebf0a3255b9d02cddff24fa194226 (patch)
tree04e1a5633bba9cff7a0d31908f2011f2de7a565f
parent4b22b288484dbdd7b614334cc328588df3e141ec (diff)
downloadpymba-fac2f7b87ebebf0a3255b9d02cddff24fa194226.tar.gz
pymba-fac2f7b87ebebf0a3255b9d02cddff24fa194226.zip
rename
-rw-r--r--pymba/__init__.py2
-rw-r--r--pymba/vimba.py12
-rw-r--r--pymba/vimba_camera.py (renamed from pymba/vimbacamera.py)10
-rw-r--r--pymba/vimba_dll.py (renamed from pymba/vimbadll.py)4
-rw-r--r--pymba/vimba_exception.py (renamed from pymba/vimbaexception.py)0
-rw-r--r--pymba/vimba_feature.py (renamed from pymba/vimbafeature.py)6
-rw-r--r--pymba/vimba_frame.py (renamed from pymba/vimbaframe.py)8
-rw-r--r--pymba/vimba_interface.py (renamed from pymba/vimbainterface.py)8
-rw-r--r--pymba/vimba_object.py (renamed from pymba/vimbaobject.py)8
-rw-r--r--pymba/vimba_structure.py (renamed from pymba/vimbastructure.py)0
-rw-r--r--pymba/vimba_system.py (renamed from pymba/vimbasystem.py)4
-rw-r--r--tests/__init__.py (renamed from pymba/tests/__init__.py)0
-rw-r--r--tests/opencv_example.py (renamed from pymba/tests/opencv_example.py)0
-rw-r--r--tests/opencv_liveview_example.py (renamed from pymba/tests/opencv_liveview_example.py)0
-rw-r--r--tests/opencv_liveview_example_color.py (renamed from pymba/tests/opencv_liveview_example_color.py)0
-rw-r--r--tests/test_cameras.py (renamed from pymba/tests/test_cameras.py)0
-rw-r--r--tests/test_enumfeature.py (renamed from pymba/tests/test_enumfeature.py)0
-rw-r--r--tests/test_installation.py (renamed from pymba/tests/test_installation.py)0
-rw-r--r--tests/test_interfaces.py (renamed from pymba/tests/test_interfaces.py)0
-rw-r--r--tests/test_systemfeature.py (renamed from pymba/tests/test_systemfeature.py)0
20 files changed, 30 insertions, 32 deletions
diff --git a/pymba/__init__.py b/pymba/__init__.py
index c6c69cd..c21ed07 100644
--- a/pymba/__init__.py
+++ b/pymba/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
from .vimba import Vimba
-from .vimbaexception import VimbaException
+from .vimba_exception import VimbaException
diff --git a/pymba/vimba.py b/pymba/vimba.py
index a1ffeaa..475dedd 100644
--- a/pymba/vimba.py
+++ b/pymba/vimba.py
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import vimbastructure as structs
-from .vimbadll import VimbaDLL
-from .vimbaexception import VimbaException
-from .vimbasystem import VimbaSystem
-from .vimbacamera import VimbaCamera
-from .vimbainterface import VimbaInterface
+from . import vimba_structure as structs
+from .vimba_dll import VimbaDLL
+from .vimba_exception import VimbaException
+from .vimba_system import VimbaSystem
+from .vimba_camera import VimbaCamera
+from .vimba_interface import VimbaInterface
from ctypes import *
diff --git a/pymba/vimbacamera.py b/pymba/vimba_camera.py
index 0a96a71..5e131a1 100644
--- a/pymba/vimbacamera.py
+++ b/pymba/vimba_camera.py
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import vimbastructure as structs
-from .vimbaobject import VimbaObject
-from .vimbaexception import VimbaException
-from .vimbaframe import VimbaFrame
-from .vimbadll import VimbaDLL
+from . import vimba_structure as structs
+from .vimba_object import VimbaObject
+from .vimba_exception import VimbaException
+from .vimba_frame import VimbaFrame
+from .vimba_dll import VimbaDLL
from ctypes import *
# camera features are automatically readable as object attributes.
diff --git a/pymba/vimbadll.py b/pymba/vimba_dll.py
index a6b9f3c..a62b087 100644
--- a/pymba/vimbadll.py
+++ b/pymba/vimba_dll.py
@@ -6,8 +6,8 @@ import platform
import os
from ctypes import *
-from . import vimbastructure as structs
-from .vimbaexception import VimbaException
+from . import vimba_structure as structs
+from .vimba_exception import VimbaException
if sys_plat == "win32":
diff --git a/pymba/vimbaexception.py b/pymba/vimba_exception.py
index 6269543..6269543 100644
--- a/pymba/vimbaexception.py
+++ b/pymba/vimba_exception.py
diff --git a/pymba/vimbafeature.py b/pymba/vimba_feature.py
index 88275ce..16c4169 100644
--- a/pymba/vimbafeature.py
+++ b/pymba/vimba_feature.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import vimbastructure as structs
-from .vimbaexception import VimbaException
-from .vimbadll import VimbaDLL
+from . import vimba_structure as structs
+from .vimba_exception import VimbaException
+from .vimba_dll import VimbaDLL
from ctypes import *
# class may extend a generic Vimba entity class one day...
diff --git a/pymba/vimbaframe.py b/pymba/vimba_frame.py
index a95f6a7..fd37aed 100644
--- a/pymba/vimbaframe.py
+++ b/pymba/vimba_frame.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import vimbastructure as structs
-from .vimbaexception import VimbaException
-from .vimbadll import VimbaDLL
-from .vimbadll import VimbaC_MemoryBlock
+from . import vimba_structure as structs
+from .vimba_exception import VimbaException
+from .vimba_dll import VimbaDLL
+from .vimba_dll import VimbaC_MemoryBlock
from ctypes import *
import warnings
try:
diff --git a/pymba/vimbainterface.py b/pymba/vimba_interface.py
index 82a0c2e..df5acdc 100644
--- a/pymba/vimbainterface.py
+++ b/pymba/vimba_interface.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import vimbastructure as structs
-from .vimbaobject import VimbaObject
-from .vimbaexception import VimbaException
-from .vimbadll import VimbaDLL
+from . import vimba_structure as structs
+from .vimba_object import VimbaObject
+from .vimba_exception import VimbaException
+from .vimba_dll import VimbaDLL
from ctypes import *
# interface features are automatically readable as object attributes.
diff --git a/pymba/vimbaobject.py b/pymba/vimba_object.py
index 695a011..f75aa75 100644
--- a/pymba/vimbaobject.py
+++ b/pymba/vimba_object.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from . import vimbastructure as structs
-from .vimbaexception import VimbaException
-from .vimbafeature import VimbaFeature
-from .vimbadll import VimbaDLL
+from . import vimba_structure as structs
+from .vimba_exception import VimbaException
+from .vimba_feature import VimbaFeature
+from .vimba_dll import VimbaDLL
from ctypes import *
diff --git a/pymba/vimbastructure.py b/pymba/vimba_structure.py
index 73c4e96..73c4e96 100644
--- a/pymba/vimbastructure.py
+++ b/pymba/vimba_structure.py
diff --git a/pymba/vimbasystem.py b/pymba/vimba_system.py
index d1f9603..f4d0c54 100644
--- a/pymba/vimbasystem.py
+++ b/pymba/vimba_system.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
-from .vimbaobject import VimbaObject
+from .vimba_object import VimbaObject
from ctypes import c_void_p
# system features are automatically readable as attributes.
@@ -16,8 +16,6 @@ class VimbaSystem(VimbaObject):
# own handle is inherited as self._handle
def __init__(self):
-
- # call super constructor
super(VimbaSystem, self).__init__()
# set own handle manually
diff --git a/pymba/tests/__init__.py b/tests/__init__.py
index e69de29..e69de29 100644
--- a/pymba/tests/__init__.py
+++ b/tests/__init__.py
diff --git a/pymba/tests/opencv_example.py b/tests/opencv_example.py
index 238e8b4..238e8b4 100644
--- a/pymba/tests/opencv_example.py
+++ b/tests/opencv_example.py
diff --git a/pymba/tests/opencv_liveview_example.py b/tests/opencv_liveview_example.py
index 78b6b67..78b6b67 100644
--- a/pymba/tests/opencv_liveview_example.py
+++ b/tests/opencv_liveview_example.py
diff --git a/pymba/tests/opencv_liveview_example_color.py b/tests/opencv_liveview_example_color.py
index fd7a819..fd7a819 100644
--- a/pymba/tests/opencv_liveview_example_color.py
+++ b/tests/opencv_liveview_example_color.py
diff --git a/pymba/tests/test_cameras.py b/tests/test_cameras.py
index a5a4dd9..a5a4dd9 100644
--- a/pymba/tests/test_cameras.py
+++ b/tests/test_cameras.py
diff --git a/pymba/tests/test_enumfeature.py b/tests/test_enumfeature.py
index 7f9dd4c..7f9dd4c 100644
--- a/pymba/tests/test_enumfeature.py
+++ b/tests/test_enumfeature.py
diff --git a/pymba/tests/test_installation.py b/tests/test_installation.py
index 06af7d6..06af7d6 100644
--- a/pymba/tests/test_installation.py
+++ b/tests/test_installation.py
diff --git a/pymba/tests/test_interfaces.py b/tests/test_interfaces.py
index 270d42c..270d42c 100644
--- a/pymba/tests/test_interfaces.py
+++ b/tests/test_interfaces.py
diff --git a/pymba/tests/test_systemfeature.py b/tests/test_systemfeature.py
index abb4da7..abb4da7 100644
--- a/pymba/tests/test_systemfeature.py
+++ b/tests/test_systemfeature.py