diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-11-05 22:35:42 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-11-05 22:35:42 +0000 |
| commit | 0e962f5de27ed7fd8bacfdd4f37cb675398c24df (patch) | |
| tree | c409a02ec65198c3772cf14a0d107bfbd12fef17 /synapse | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_sup... (diff) | |
| download | synapse-0e962f5de27ed7fd8bacfdd4f37cb675398c24df.tar.xz | |
fix py2/3 incompatibility
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 026ad511d2..38d862698d 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -13,8 +13,8 @@ # 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. - import logging +from builtins import str from synapse.http.endpoint import parse_and_validate_server_name from synapse.types import UserID @@ -90,7 +90,7 @@ class ServerConfig(Config): self.support_user_id = None autocreate_support_user = config.get('autocreate_support_user', None) if autocreate_support_user: - self.support_user_pass = unicode(autocreate_support_user['password'], "utf-8") + self.support_user_pass = str(autocreate_support_user['password']) localpart = autocreate_support_user['localpart'] self.support_user_id = UserID(localpart, self.server_name).to_string() |