revert changes for creating pull request

- "search for VimbaC DLL in current directory first"
- "string decodes / encodes"

3 files changed, 13 insertions, 18 deletions

diff --git a/pymba/vimbadll.py b/pymba/vimbadll.py
index a06aa45..4b38f9c 100644
--- a/pymba/vimbadll.py
+++ b/pymba/vimbadll.py
@@ -12,26 +12,21 @@ from .vimbaexception import VimbaException
 if sys_plat == "win32":
 
     def find_win_dll(arch):
+        """ Finds the highest versioned windows dll for the specified architecture. """
+        bases = [
+            r'C:\Program Files\Allied Vision Technologies\AVTVimba_%i.%i\VimbaC\Bin\Win%i\VimbaC.dll',
+            r'C:\Program Files\Allied Vision\Vimba_%i.%i\VimbaC\Bin\Win%i\VimbaC.dll'
+        ]
         dlls = []
-        candidate = r'.\VimbaC.dll'
-        if os.path.isfile(candidate):
-            # use local copy
-            dlls.append(candidate)
-        else:
-            """ Finds the highest versioned windows dll for the specified architecture. """
-            bases = [
-                r'C:\Program Files\Allied Vision Technologies\AVTVimba_%i.%i\VimbaC\Bin\Win%i\VimbaC.dll',
-                r'C:\Program Files\Allied Vision\Vimba_%i.%i\VimbaC\Bin\Win%i\VimbaC.dll'
-            ]
-            for base in bases:
-                for major in range(3):
-                    for minor in range(10):
-                        candidate = base % (major, minor, arch)
-                        if os.path.isfile(candidate):
+        for base in bases:
+            for major in range(3):
+                for minor in range(10):
+                    candidate = base % (major, minor, arch)
+                    if os.path.isfile(candidate):
                             dlls.append(candidate)
         if not dlls:
             if 'VIMBA_HOME' in os.environ:
-                candidate = os.path.join(os.environ ['VIMBA_HOME'], r'VimbaC\Bin\Win%i\VimbaC.dll' % (arch))
+                candidate = os.environ ['VIMBA_HOME'] + '\VimbaC\Bin\Win%i\VimbaC.dll' % (arch)
                 if os.path.isfile(candidate):
                     dlls.append(candidate)
         if not dlls:
diff --git a/pymba/vimbafeature.py b/pymba/vimbafeature.py
index 97473ef..88275ce 100644
--- a/pymba/vimbafeature.py
+++ b/pymba/vimbafeature.py
@@ -203,7 +203,7 @@ class VimbaFeature(object):
 
         # create args
         bufferSize = 256
-        valueToGet = create_string_buffer(('\000' * bufferSize).encode())
+        valueToGet = create_string_buffer('\000' * bufferSize)
         sizeFilled = c_uint32()
 
         errorCode = VimbaDLL.featureStringGet(self._handle,
diff --git a/pymba/vimbaobject.py b/pymba/vimbaobject.py
index 69a047c..695a011 100644
--- a/pymba/vimbaobject.py
+++ b/pymba/vimbaobject.py
@@ -138,7 +138,7 @@ class VimbaObject(object):
                   list -- names of possible enum values (for enum features only).
         """
         # can't cache this, need to look it up live
-        return VimbaFeature(featureName, self._handle).range
+        return VimbaFeature(featureName.encode(), self._handle).range
 
     def runFeatureCommand(self, featureName):
         """