img: add _App1Marker select to _MarkerFactory()

Steve Canny · Steve Canny · commit 95c72b880510 · 2014-02-27T12:08:37.000-08:00
diff --git a/docx/image/jpeg.py b/docx/image/jpeg.py
@@ -270,11 +270,14 @@ def _MarkerFactory(marker_code, stream, offset):
     in *stream* having *marker_code*.
     """
     if marker_code == JPEG_MARKER_CODE.APP0:
-        return _App0Marker.from_stream(stream, marker_code, offset)
+        marker_cls = _App0Marker
+    elif marker_code == JPEG_MARKER_CODE.APP1:
+        marker_cls = _App1Marker
     elif marker_code in JPEG_MARKER_CODE.SOF_MARKER_CODES:
-        return _SofMarker.from_stream(stream, marker_code, offset)
+        marker_cls = _SofMarker
     else:
-        return _Marker.from_stream(stream, marker_code, offset)
+        marker_cls = _Marker
+    return marker_cls.from_stream(stream, marker_code, offset)
 
 
 class _Marker(object):
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
@@ -395,16 +395,19 @@ def it_constructs_the_appropriate_marker_object(self, call_fixture):
 
     @pytest.fixture(params=[
         JPEG_MARKER_CODE.APP0,
+        JPEG_MARKER_CODE.APP1,
         JPEG_MARKER_CODE.SOF0,
         JPEG_MARKER_CODE.SOF7,
         JPEG_MARKER_CODE.SOS,
     ])
     def call_fixture(
-            self, request, stream_, offset_, _App0Marker_, _SofMarker_,
-            _Marker_):
+            self, request, stream_, offset_, _App0Marker_, _App1Marker_,
+            _SofMarker_, _Marker_):
         marker_code = request.param
         if marker_code == JPEG_MARKER_CODE.APP0:
             marker_cls_ = _App0Marker_
+        elif marker_code == JPEG_MARKER_CODE.APP1:
+            marker_cls_ = _App1Marker_
         elif marker_code in JPEG_MARKER_CODE.SOF_MARKER_CODES:
             marker_cls_ = _SofMarker_
         else:
@@ -415,6 +418,10 @@ def call_fixture(
     def _App0Marker_(self, request):
         return class_mock(request, 'docx.image.jpeg._App0Marker')
 
+    @pytest.fixture
+    def _App1Marker_(self, request):
+        return class_mock(request, 'docx.image.jpeg._App1Marker')
+
     @pytest.fixture
     def _Marker_(self, request):
         return class_mock(request, 'docx.image.jpeg._Marker')
