From 381e3db369688f3fb8431c46b06369ac6ff95797 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Fri, 4 Mar 2011 07:31:40 -0500
Subject: [PATCH] Rename function.

---
 src/calibre/__init__.py                        | 4 ++--
 src/calibre/gui2/store/diesel_ebooks_plugin.py | 4 ++--
 src/calibre/gui2/store/feedbooks_plugin.py     | 4 ++--
 src/calibre/gui2/store/gutenberg_plugin.py     | 4 ++--
 src/calibre/gui2/store/manybooks_plugin.py     | 4 ++--
 src/calibre/gui2/store/smashwords_plugin.py    | 4 ++--
 src/calibre/gui2/store/web_store_dialog.py     | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index f324a7e46c..dbbb8b2296 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -473,11 +473,11 @@ def as_unicode(obj, enc=preferred_encoding):
                 obj = repr(obj)
     return force_unicode(obj, enc=enc)
 
-def http_url_slash_cleaner(url):
+def url_slash_cleaner(url):
     '''
     Removes redundant /'s from url's.
     '''
-    return re.sub(r'(?<!http:)/{2,}', '/', url)
+    return re.sub(r'(?<!:)/{2,}', '/', url)
 
 def human_readable(size):
     """ Convert a size in bytes into a human readable form """
diff --git a/src/calibre/gui2/store/diesel_ebooks_plugin.py b/src/calibre/gui2/store/diesel_ebooks_plugin.py
index a213ffd5c4..9f2ee9dfcf 100644
--- a/src/calibre/gui2/store/diesel_ebooks_plugin.py
+++ b/src/calibre/gui2/store/diesel_ebooks_plugin.py
@@ -12,7 +12,7 @@ from lxml import html
 
 from PyQt4.Qt import QUrl
 
-from calibre import browser, http_url_slash_cleaner
+from calibre import browser, url_slash_cleaner
 from calibre.gui2 import open_url
 from calibre.gui2.store import StorePlugin
 from calibre.gui2.store.basic_config import BasicStoreConfig
@@ -33,7 +33,7 @@ class DieselEbooksStore(BasicStoreConfig, StorePlugin):
         if external or settings.get(self.name + '_open_external', False):
             if detail_item:
                 url = url + detail_item
-            open_url(QUrl(http_url_slash_cleaner(url + aff_id)))
+            open_url(QUrl(url_slash_cleaner(url + aff_id)))
         else:
             d = WebStoreDialog(self.gui, url + aff_id, parent, detail_item)
             d.setWindowTitle(self.name)
diff --git a/src/calibre/gui2/store/feedbooks_plugin.py b/src/calibre/gui2/store/feedbooks_plugin.py
index ea27e0ca17..546e5cb389 100644
--- a/src/calibre/gui2/store/feedbooks_plugin.py
+++ b/src/calibre/gui2/store/feedbooks_plugin.py
@@ -11,7 +11,7 @@ from lxml import html
 
 from PyQt4.Qt import QUrl
 
-from calibre import browser, http_url_slash_cleaner
+from calibre import browser, url_slash_cleaner
 from calibre.gui2 import open_url
 from calibre.gui2.store import StorePlugin
 from calibre.gui2.store.basic_config import BasicStoreConfig
@@ -28,7 +28,7 @@ class FeedbooksStore(BasicStoreConfig, StorePlugin):
         if external or settings.get(self.name + '_open_external', False):
             if detail_item:
                 ext_url = ext_url + detail_item
-            open_url(QUrl(http_url_slash_cleaner(ext_url)))
+            open_url(QUrl(url_slash_cleaner(ext_url)))
         else:
             d = WebStoreDialog(self.gui, url, parent, detail_item)
             d.setWindowTitle(self.name)
diff --git a/src/calibre/gui2/store/gutenberg_plugin.py b/src/calibre/gui2/store/gutenberg_plugin.py
index 69df15c238..537ff9e274 100644
--- a/src/calibre/gui2/store/gutenberg_plugin.py
+++ b/src/calibre/gui2/store/gutenberg_plugin.py
@@ -11,7 +11,7 @@ from lxml import html
 
 from PyQt4.Qt import QUrl
 
-from calibre import browser, http_url_slash_cleaner
+from calibre import browser, url_slash_cleaner
 from calibre.gui2 import open_url
 from calibre.gui2.store import StorePlugin
 from calibre.gui2.store.basic_config import BasicStoreConfig
@@ -28,7 +28,7 @@ class GutenbergStore(BasicStoreConfig, StorePlugin):
         if external or settings.get(self.name + '_open_external', False):
             if detail_item:
                 ext_url = ext_url + detail_item
-            open_url(QUrl(http_url_slash_cleaner(ext_url)))
+            open_url(QUrl(url_slash_cleaner(ext_url)))
         else:
             d = WebStoreDialog(self.gui, url, parent, detail_item)
             d.setWindowTitle(self.name)
diff --git a/src/calibre/gui2/store/manybooks_plugin.py b/src/calibre/gui2/store/manybooks_plugin.py
index 94c9a38863..bc239dc96e 100644
--- a/src/calibre/gui2/store/manybooks_plugin.py
+++ b/src/calibre/gui2/store/manybooks_plugin.py
@@ -12,7 +12,7 @@ from lxml import html
 
 from PyQt4.Qt import QUrl
 
-from calibre import browser, http_url_slash_cleaner
+from calibre import browser, url_slash_cleaner
 from calibre.gui2 import open_url
 from calibre.gui2.store import StorePlugin
 from calibre.gui2.store.basic_config import BasicStoreConfig
@@ -28,7 +28,7 @@ class ManyBooksStore(BasicStoreConfig, StorePlugin):
         if external or settings.get(self.name + '_open_external', False):
             if detail_item:
                 url = url + detail_item
-            open_url(QUrl(http_url_slash_cleaner(url)))
+            open_url(QUrl(url_slash_cleaner(url)))
         else:
             d = WebStoreDialog(self.gui, url, parent, detail_item)
             d.setWindowTitle(self.name)
diff --git a/src/calibre/gui2/store/smashwords_plugin.py b/src/calibre/gui2/store/smashwords_plugin.py
index 5307cb0072..f1d93ec2af 100644
--- a/src/calibre/gui2/store/smashwords_plugin.py
+++ b/src/calibre/gui2/store/smashwords_plugin.py
@@ -13,7 +13,7 @@ from lxml import html
 
 from PyQt4.Qt import QUrl
 
-from calibre import browser, http_url_slash_cleaner
+from calibre import browser, url_slash_cleaner
 from calibre.gui2 import open_url
 from calibre.gui2.store import StorePlugin
 from calibre.gui2.store.basic_config import BasicStoreConfig
@@ -34,7 +34,7 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin):
         if external or settings.get(self.name + '_open_external', False):
             if detail_item:
                 url = url + detail_item
-            open_url(QUrl(http_url_slash_cleaner(url + aff_id)))
+            open_url(QUrl(url_slash_cleaner(url + aff_id)))
         else:
             d = WebStoreDialog(self.gui, url + aff_id, parent, detail_item)
             d.setWindowTitle(self.name)
diff --git a/src/calibre/gui2/store/web_store_dialog.py b/src/calibre/gui2/store/web_store_dialog.py
index a651cf3085..5d7a338a0c 100644
--- a/src/calibre/gui2/store/web_store_dialog.py
+++ b/src/calibre/gui2/store/web_store_dialog.py
@@ -9,7 +9,7 @@ import urllib
 
 from PyQt4.Qt import QDialog, QUrl
 
-from calibre import http_url_slash_cleaner
+from calibre import url_slash_cleaner
 from calibre.gui2.store.web_store_dialog_ui import Ui_Dialog
 
 class WebStoreDialog(QDialog, Ui_Dialog):
@@ -52,5 +52,5 @@ class WebStoreDialog(QDialog, Ui_Dialog):
         # Reduce redundant /'s because some stores
         # (Feedbooks) and server frameworks (cherrypy)
         # choke on them. 
-        url = http_url_slash_cleaner(url)
+        url = url_slash_cleaner(url)
         self.view.load(QUrl(url))