From d1e56cfcd11bcd509d8fa3954c00e06a84bddd87 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 10 Apr 2018 00:21:51 +0100
Subject: [PATCH] Fix pep8 error on psycopg2cffi hack
---
synapse/storage/engines/__init__.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/synapse/storage/engines/__init__.py b/synapse/storage/engines/__init__.py
index be7f6d6ac3..8c868ece75 100644
--- a/synapse/storage/engines/__init__.py
+++ b/synapse/storage/engines/__init__.py
@@ -32,12 +32,11 @@ def create_engine(database_config):
engine_class = SUPPORTED_MODULE.get(name, None)
if engine_class:
- needs_pypy_hack = (name == "psycopg2" and
- platform.python_implementation() == "PyPy")
- if needs_pypy_hack:
- module = importlib.import_module("psycopg2cffi")
- else:
- module = importlib.import_module(name)
+ # pypy requires psycopg2cffi rather than psycopg2
+ if (name == "psycopg2" and
+ platform.python_implementation() == "PyPy"):
+ name = "psycopg2cffi"
+ module = importlib.import_module(name)
return engine_class(module, database_config)
raise RuntimeError(
--
GitLab