Add copyright notices and fix pyflakes errors

This commit is contained in:
Mark Haines 2014-09-03 09:43:11 +01:00
parent 112c7ea315
commit c6eafdfbaf
7 changed files with 59 additions and 7 deletions

View File

@ -1,3 +1,17 @@
# Copyright 2014 matrix.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 collections import collections
@ -31,7 +45,7 @@ class Ratelimiter(object):
if sent_count < 0: if sent_count < 0:
allowed = True allowed = True
time_start = time_now_s time_start = time_now_s
messagecount = 1. message_count = 1.
elif sent_count > burst_count - 1.: elif sent_count > burst_count - 1.:
allowed = False allowed = False
else: else:

View File

@ -13,8 +13,6 @@
# 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.
import ConfigParser as configparser
import argparse import argparse
import sys import sys
import os import os

View File

@ -1,3 +1,17 @@
# Copyright 2014 matrix.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 ._base import Config from ._base import Config
class RatelimitConfig(Config): class RatelimitConfig(Config):

View File

@ -1,4 +1,18 @@
from twisted.internet import reactor, ssl # Copyright 2014 matrix.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 twisted.internet import ssl
from OpenSSL import SSL from OpenSSL import SSL
from twisted.internet._sslverify import _OpenSSLECCurve, _defaultCurveName from twisted.internet._sslverify import _OpenSSLECCurve, _defaultCurveName

View File

@ -111,8 +111,6 @@ class RoomCreationHandler(BaseRoomHandler):
servers=[self.hs.hostname], servers=[self.hs.hostname],
) )
federation_handler = self.hs.get_handlers().federation_handler
@defer.inlineCallbacks @defer.inlineCallbacks
def handle_event(event): def handle_event(event):
snapshot = yield self.store.snapshot_room( snapshot = yield self.store.snapshot_room(

View File

@ -1,3 +1,18 @@
/* Copyright 2014 matrix.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* 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.
*/
CREATE TABLE IF NOT EXISTS room_aliases( CREATE TABLE IF NOT EXISTS room_aliases(
room_alias TEXT NOT NULL, room_alias TEXT NOT NULL,
room_id TEXT NOT NULL room_id TEXT NOT NULL

View File

@ -19,7 +19,6 @@ from functools import wraps
import logging import logging
import inspect import inspect
import traceback
def log_function(f): def log_function(f):