Fix lint issues

Author: adamtheturtle

src/vws/vws.py

@@ -23,15 +23,11 @@
     ImageTooLarge,
     InactiveProject,
     MetadataTooLarge,
-<<<<<<< HEAD
     ProjectInactive,
     RequestQuotaReached,
     RequestTimeTooSkewed,
     TargetNameExist,
     TargetStatusNotSuccess,
-=======
-    TargetNameExist,
->>>>>>> origin/master
     TargetStatusProcessing,
     UnknownTarget,
 )
@@ -124,27 +120,20 @@ class _ResultCodes(Enum):
 
 
 _EXCEPTIONS = {
-<<<<<<< HEAD
     _ResultCodes.AUTHENTICATION_FAILURE: AuthenticationFailure,
-    _ResultCodes.REQUEST_TIME_TOO_SKEWED: RequestTimeTooSkewed,
-    _ResultCodes.TARGET_NAME_EXIST: TargetNameExist,
-    _ResultCodes.UNKNOWN_TARGET: UnknownTarget,
     _ResultCodes.BAD_IMAGE: BadImage,
-    _ResultCodes.IMAGE_TOO_LARGE: ImageTooLarge,
-    _ResultCodes.METADATA_TOO_LARGE: MetadataTooLarge,
     _ResultCodes.DATE_RANGE_ERROR: DateRangeError,
     _ResultCodes.FAIL: Fail,
-    _ResultCodes.TARGET_STATUS_PROCESSING: TargetStatusProcessing,
-    _ResultCodes.REQUEST_QUOTA_REACHED: RequestQuotaReached,
-    _ResultCodes.TARGET_STATUS_NOT_SUCCESS: TargetStatusNotSuccess,
-    _ResultCodes.PROJECT_INACTIVE: ProjectInactive,
+    _ResultCodes.IMAGE_TOO_LARGE: ImageTooLarge,
     _ResultCodes.INACTIVE_PROJECT: InactiveProject,
-=======
     _ResultCodes.METADATA_TOO_LARGE: MetadataTooLarge,
+    _ResultCodes.PROJECT_INACTIVE: ProjectInactive,
+    _ResultCodes.REQUEST_QUOTA_REACHED: RequestQuotaReached,
+    _ResultCodes.REQUEST_TIME_TOO_SKEWED: RequestTimeTooSkewed,
     _ResultCodes.TARGET_NAME_EXIST: TargetNameExist,
+    _ResultCodes.TARGET_STATUS_NOT_SUCCESS: TargetStatusNotSuccess,
     _ResultCodes.TARGET_STATUS_PROCESSING: TargetStatusProcessing,
     _ResultCodes.UNKNOWN_TARGET: UnknownTarget,
->>>>>>> origin/master
 }
 
 

tests/test_add_target.py

@@ -143,8 +143,8 @@ def test_authentication_error(
                     image=high_quality_image,
                 )
 
-            exception = exc.value
-            assert exception.response.status_code == codes.BAD_REQUEST
+        exception = exc.value
+        assert exception.response.status_code == codes.BAD_REQUEST
 
 
 class TestImage: