Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-08 05:52:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

isort 5 compatibility (#7786)

Browse source 
The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
This commit is contained in:
Will Hunt 2020-07-05 16:32:02 +01:00 • committed by GitHub
parent 5cdca53aa0
commit 62b1ce8539
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 22 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/config/emailconfig.py
View file

@ -14,7 +14,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
# This file can't be called email.py because if it is, we cannot:
@ -145,8 +144,8 @@ class EmailConfig(Config):
or self.threepid_behaviour_email == ThreepidBehaviour.LOCAL
):
# make sure we can import the required deps
import jinja2
import bleach
import jinja2
# prevent unused warnings
jinja2