summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 16:52:22 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 16:52:22 +0000
commit7eef84a95b53318e97ab74dd25fee584714a8e6a (patch)
tree5446de555269c39ebe5ceae1d13f6e7b4155e18f
parentRemove more debug logging (diff)
downloadsynapse-7eef84a95b53318e97ab74dd25fee584714a8e6a.tar.xz
pyflakes
-rw-r--r--synapse/events/__init__.py2
-rw-r--r--synapse/storage/__init__.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py
index f4ec8cd18c..64e08223b0 100644
--- a/synapse/events/__init__.py
+++ b/synapse/events/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from synapse.util.frozenutils import freeze, unfreeze
+from synapse.util.frozenutils import freeze
 
 
 class _EventInternalMetadata(object):
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 94603ef826..a0284d54b9 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -44,7 +44,6 @@ from syutil.jsonutil import encode_canonical_json
 from synapse.crypto.event_signing import compute_event_reference_hash
 
 
-import simplejson as json
 import logging
 import os