MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-15 14:32:30 +01:00
Code Issues Projects Releases Wiki Activity

Pre-emptively fix synapse.storage.types.Connection for future mypy release (#8577)

Browse source 
Fix the Connection protocol according to typeshed's assertions about sqlite3.Connection
This commit is contained in:
Jonathan de Jong 2020-10-17 10:51:38 +02:00 committed by GitHub
parent 0afd83584b
commit 79c1f973ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8577.misc Normal file
View file

@ -0,0 +1 @@
Adjust a protocol-type definition to fit `sqlite3` assertions.

2
synapse/storage/database.py
View file

@ -160,7 +160,7 @@ class LoggingDatabaseConnection:
self.conn.__enter__() self.conn.__enter__()
return self return self
def __exit__(self, exc_type, exc_value, traceback) -> bool: def __exit__(self, exc_type, exc_value, traceback) -> Optional[bool]:
return self.conn.__exit__(exc_type, exc_value, traceback) return self.conn.__exit__(exc_type, exc_value, traceback)
# Proxy through any unknown lookups to the DB conn class. # Proxy through any unknown lookups to the DB conn class.

4
synapse/storage/types.py
View file

@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from typing import Any, Iterable, Iterator, List, Tuple from typing import Any, Iterable, Iterator, List, Optional, Tuple
from typing_extensions import Protocol from typing_extensions import Protocol
@ -65,5 +65,5 @@ class Connection(Protocol):
def __enter__(self) -> "Connection": def __enter__(self) -> "Connection":
... ...
def __exit__(self, exc_type, exc_value, traceback) -> bool: def __exit__(self, exc_type, exc_value, traceback) -> Optional[bool]:
... ...