From 593e45a9bbed22f4579e4206952f1c1d1d3b9203 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 7 Dec 2011 18:06:54 +0900
Subject: [PATCH] decrease timeout to 30; httplib2 retries for us

---
 anki/consts.py | 2 +-
 anki/sync.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anki/consts.py b/anki/consts.py
index c87bd744a..a796cc2a4 100644
--- a/anki/consts.py
+++ b/anki/consts.py
@@ -41,7 +41,7 @@ MIME_BOUNDARY = "Anki-sync-boundary"
 SYNC_URL = os.environ.get("SYNC_URL") or "https://ankiweb.net/sync/"
 SYNC_VER = 0
 HTTP_CERTS = os.path.join(os.path.dirname(__file__), "ankiweb.certs")
-HTTP_TIMEOUT = 60
+HTTP_TIMEOUT = 30
 
 # deck schema
 SCHEMA_VERSION = 1
diff --git a/anki/sync.py b/anki/sync.py
index 3a81af2dd..6a7898744 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -585,7 +585,7 @@ class MediaSyncer(object):
         c = self.mediaSanity()
         if c != s:
             raise Exception("""\
-Sanity check failed. Please copy and paste the text below:\n%s\n%s""" %
+Media sanity check failed. Please copy and paste the text below:\n%s\n%s""" %
                             (c, s))
         return "success"