Erik Johnston
|
a41117c63b
|
Make _escape_character take MatchObject
|
2018-05-02 17:27:27 +01:00 |
|
Erik Johnston
|
32015e1109
|
Escape label values in prometheus metrics
|
2018-05-02 16:52:42 +01:00 |
|
Richard van der Hoff
|
a8d8bf92e0
|
Merge pull request #3168 from matrix-org/rav/fix_logformatter
Fix incorrect reference to StringIO
|
2018-05-02 10:03:36 +01:00 |
|
Richard van der Hoff
|
e482f8cd85
|
Fix incorrect reference to StringIO
This was introduced in 4f2f5171
|
2018-05-02 09:12:26 +01:00 |
|
Matthew Hodgson
|
9f21de6a01
|
missing word :|
|
2018-05-01 19:19:46 +01:00 |
|
Matthew Hodgson
|
8ae7096958
|
Merge branch 'release-v0.28.1' into develop
|
2018-05-01 19:05:03 +01:00 |
|
Matthew Hodgson
|
5c2214f4c7
|
fix markdown
|
2018-05-01 19:03:35 +01:00 |
|
Neil Johnson
|
2414178ed6
|
Merge branch 'master' into develop
|
2018-05-01 18:53:56 +01:00 |
|
Neil Johnson
|
40d1bbd257
|
fix conflict in changelog from previous release
|
2018-05-01 18:52:44 +01:00 |
|
Matthew Hodgson
|
8e6bd0e324
|
changelog for 0.28.1
|
2018-05-01 18:28:23 +01:00 |
|
Neil Johnson
|
8570bb84cc
|
Update __init__.py
bump version
|
2018-05-01 18:22:53 +01:00 |
|
Richard van der Hoff
|
ca7211104e
|
Merge branch 'release-v0.28.1' into develop
|
2018-05-01 18:16:57 +01:00 |
|
Richard van der Hoff
|
d5eee5d601
|
Merge commit '33f469b' into release-v0.28.1
|
2018-05-01 18:14:18 +01:00 |
|
Richard van der Hoff
|
d858f3bd4e
|
Miscellaneous fixes to python_dependencies
* add some doc about wtf this thing does
* pin Twisted to < 18.4
* add explicit dep on six (fixes #3089)
|
2018-05-01 18:13:54 +01:00 |
|
Richard van der Hoff
|
33f469ba19
|
Apply some limits to depth to counter abuse
* When creating a new event, cap its depth to 2^63 - 1
* When receiving events, reject any without a sensible depth
As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI
|
2018-05-01 17:54:19 +01:00 |
|
Will Hunt
|
2ad3fc36e6
|
Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)
fixes #3135
Signed-off-by: Will Hunt will@half-shot.uk
|
2018-04-30 16:21:11 +01:00 |
|
Richard van der Hoff
|
cead75fae3
|
Merge pull request #3160 from krombel/fix_3076
add guard for None on purge_history api
|
2018-04-30 15:03:59 +01:00 |
|
Krombel
|
576b71dd3d
|
add guard for None on purge_history api
|
2018-04-30 14:29:48 +02:00 |
|
Matthew Hodgson
|
99a54bf2af
|
Merge pull request #3129 from matrix-org/matthew/fix_group_dups
remove duplicates from groups tables
|
2018-04-30 11:47:25 +01:00 |
|
Richard van der Hoff
|
63ae5cbf34
|
Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fn
Remove redundant call to preserve_fn
|
2018-04-30 10:23:59 +01:00 |
|
Richard van der Hoff
|
fdb6849b81
|
Merge pull request #3144 from matrix-org/rav/run_in_background_exception_handling
Trap exceptions thrown within run_in_background
|
2018-04-30 10:23:02 +01:00 |
|
Richard van der Hoff
|
66aa32ede2
|
Merge pull request #3159 from NotAFile/py3-tests-config
run config tests on py3
|
2018-04-30 10:22:45 +01:00 |
|
Adrian Tschira
|
6e005d1382
|
run config tests on py3
Signed-off-by: Adrian Tschira <nota@notafile.com>
|
2018-04-30 10:39:45 +02:00 |
|
Richard van der Hoff
|
01e8a52825
|
Merge pull request #3102 from NotAFile/py3-attributeerror
Make event properties raise AttributeError instead
|
2018-04-30 09:22:09 +01:00 |
|
Adrian Tschira
|
0c9db26260
|
add comment explaining attributeerror
|
2018-04-30 09:49:10 +02:00 |
|
Richard van der Hoff
|
950a32eb47
|
Merge pull request #3152 from NotAFile/py3-local-imports
make imports local
|
2018-04-30 01:28:13 +01:00 |
|
Richard van der Hoff
|
bc2017a594
|
Merge pull request #3153 from NotAFile/py3-httplib
move httplib import to six
|
2018-04-30 01:26:42 +01:00 |
|
Richard van der Hoff
|
683149c1f9
|
Merge pull request #3151 from NotAFile/py3-xrange-1
Move more xrange to six
|
2018-04-30 01:20:06 +01:00 |
|
Richard van der Hoff
|
7b908aeec4
|
Merge branch 'rav/test_36' into develop
|
2018-04-30 01:12:58 +01:00 |
|
Richard van der Hoff
|
3b0e431c82
|
Merge pull request #3150 from NotAFile/py3-listcomp-yield
Don't yield in list comprehensions
|
2018-04-30 01:11:41 +01:00 |
|
Richard van der Hoff
|
db75c86e84
|
Merge branch 'develop' into py3-xrange-1
|
2018-04-30 01:02:25 +01:00 |
|
Richard van der Hoff
|
2fd96727b1
|
Merge pull request #3085 from NotAFile/py3-config-text-mode
Open config file in non-bytes mode
|
2018-04-30 01:00:23 +01:00 |
|
Richard van der Hoff
|
b8ee12b978
|
Merge pull request #3084 from NotAFile/py3-certs-byte-mode
Open certificate files as bytes
|
2018-04-30 01:00:05 +01:00 |
|
Richard van der Hoff
|
049b0b5af2
|
Merge pull request #3154 from NotAFile/py3-stringio
Replace stringIO imports with six
|
2018-04-30 00:59:04 +01:00 |
|
Richard van der Hoff
|
d1d54d6088
|
add py36 to build matrix
|
2018-04-30 00:58:31 +01:00 |
|
Richard van der Hoff
|
ac5f2f4d86
|
Merge pull request #3145 from NotAFile/py3-tests
Add py3 tests to tox with folders that work
|
2018-04-30 00:53:05 +01:00 |
|
Richard van der Hoff
|
af3cc50511
|
Remove redundant call to preserve_fn
submit_event_for_as doesn't return a deferred anyway, so this is pointless.
|
2018-04-30 00:48:36 +01:00 |
|
Richard van der Hoff
|
dbf6f28d64
|
Merge pull request #3155 from NotAFile/py3-bytes-1
more bytes strings
|
2018-04-30 00:38:21 +01:00 |
|
Richard van der Hoff
|
7767a9fc0e
|
Update tox.ini
add missing comma
|
2018-04-30 00:37:32 +01:00 |
|
Richard van der Hoff
|
aab2e4da60
|
Merge pull request #3140 from matrix-org/rav/use_run_in_background
Use run_in_background in preference to preserve_fn
|
2018-04-30 00:34:28 +01:00 |
|
Richard van der Hoff
|
1315d374cc
|
Merge pull request #3156 from NotAFile/py3-hmac-bytes
Construct HMAC as bytes on py3
|
2018-04-30 00:33:20 +01:00 |
|
Richard van der Hoff
|
9e2601f830
|
Merge pull request #3108 from NotAFile/py3-six-urlparse
Use six.moves.urlparse
|
2018-04-30 00:33:05 +01:00 |
|
Adrian Tschira
|
122593265b
|
Construct HMAC as bytes on py3
Signed-off-by: Adrian Tschira <nota@notafile.com>
|
2018-04-29 00:19:41 +02:00 |
|
Adrian Tschira
|
e9143b6593
|
more bytes strings
Signed-off-by: Adrian Tschira <nota@notafile.com>
|
2018-04-29 00:13:57 +02:00 |
|
Matthew Hodgson
|
adaf3ec87f
|
fix missing import
|
2018-04-28 22:39:15 +01:00 |
|
Matthew Hodgson
|
006e18b6bb
|
pep8
|
2018-04-28 22:32:24 +01:00 |
|
Matthew Hodgson
|
42c89c8215
|
make it work with sqlite
|
2018-04-28 22:27:30 +01:00 |
|
Adrian Tschira
|
d82b6ea9e6
|
Move more xrange to six
plus a bonus next()
Signed-off-by: Adrian Tschira <nota@notafile.com>
|
2018-04-28 13:57:00 +02:00 |
|
Adrian Tschira
|
4f2f5171b7
|
replace stringIO imports
|
2018-04-28 13:46:23 +02:00 |
|
Adrian Tschira
|
94f4d7f49e
|
move httplib import to six
|
2018-04-28 13:43:34 +02:00 |
|