diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-11 17:48:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-11 17:48:48 +0000 |
| commit | cde840a82c9397f9f880102520d0193462efc13f (patch) | |
| tree | 7e875e0514fd8db28244ba813927d293c4cb7929 /docs/code_style.rst | |
| parent | Fix replication tests (diff) | |
| parent | Merge pull request #23 from matrix-org/media_repository (diff) | |
| download | synapse-cde840a82c9397f9f880102520d0193462efc13f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: setup.py
Diffstat (limited to 'docs/code_style.rst')
| -rw-r--r-- | docs/code_style.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/code_style.rst b/docs/code_style.rst index 6e53f3eb09..dc40a7ab7b 100644 --- a/docs/code_style.rst +++ b/docs/code_style.rst @@ -22,17 +22,17 @@ Basically, PEP8 depending on the size and shape of the arguments and what makes more sense to the author. In other words, both this:: - print("I am a fish %s", "moo") + print("I am a fish %s" % "moo") and this:: - print("I am a fish %s", + print("I am a fish %s" % "moo") and this:: print( - "I am a fish %s", + "I am a fish %s" % "moo" ) |