diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-07 12:16:05 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-07 12:16:05 +0100 |
| commit | 0bfa78b39bf95ee24e78166c9545f59b34fd1d81 (patch) | |
| tree | af7d4bd45c2c57068747c905f61774d478ddc0ba /synapse/app/homeserver.py | |
| parent | Fix prepare_sqlite3_database's convert_param_style (diff) | |
| download | synapse-0bfa78b39bf95ee24e78166c9545f59b34fd1d81.tar.xz | |
PEP8
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 95190c1d75..f7c724c4b4 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -17,9 +17,7 @@ import sys sys.dont_write_bytecode = True -from synapse.storage import ( - prepare_database, UpgradeDatabaseException, -) +from synapse.storage import UpgradeDatabaseException from synapse.storage.engines import create_engine from synapse.server import HomeServer @@ -60,7 +58,6 @@ import os import re import resource import subprocess -import sqlite3 import yaml @@ -322,7 +319,7 @@ def change_resource_limit(soft_file_no): resource.setrlimit(resource.RLIMIT_NOFILE, (soft_file_no, hard)) logger.info("Set file limit to: %d", soft_file_no) - except ( ValueError, resource.error) as e: + except (ValueError, resource.error) as e: logger.warn("Failed to set file limit: %s", e) |