Correct Answer: B,C
Each changed line is prepended with either a "+" or a "-" symbol. A line that is prepended with a
"-" sign comes from fish.py, while a line with a "+" sign comes from cat.py. In most cases, Git picks fish.py and cat.py in such a way that you can think of fish.py/- as "old" content and cat.py/+ as "new" content.
160 - @single_request_timeout.setter
161 - def single_request_timeout(self,value):
162 - "'''The timeout (seconds) for a single HTTP REST API request."
163 - check_type(value, int, optional=True)
"-" value = this line was deleted from fish.py
164 - assert value is None or value > 0
"+" value = this line was added -
165 - if value is not None and value <= 0:
"+" value = this line was added -
166 - raise ValueError("single_request_timeout must be positive integer") self._single_request_timeout = value
167 - self._ single_request_timeout = value