FIX: mountpoint at '/'

oe-alliance · May 28, 2013 · 6a4937c · 6a4937c
1 parent 029f11e
commit 6a4937c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/fritzcall/src/FritzCallFBF.py b/fritzcall/src/FritzCallFBF.py
@@ -2,12 +2,14 @@
 '''
 Created on 30.09.2012
 $Author: michael $
-$Revision: 771 $
-$Date: 2013-04-06 12:08:41 +0200 (Sat, 06 Apr 2013) $
-$Id: FritzCallFBF.py 771 2013-04-06 10:08:41Z michael $
+$Revision: 776 $
+$Date: 2013-05-11 13:15:24 +0200 (Sat, 11 May 2013) $
+$Id: FritzCallFBF.py 776 2013-05-11 11:15:24Z michael $
 '''
 
-from . import _, __, debug #@UnresolvedImport # pylint: disable=E0611,F0401
+# pylint: disable=W1401,E0611,F0401
+
+from . import _, __, debug #@UnresolvedImport
 from plugin import config, fritzbox, stripCbCPrefix, resolveNumberWithAvon, FBF_IN_CALLS, FBF_OUT_CALLS, FBF_MISSED_CALLS
 from Tools import Notifications
 from Screens.MessageBox import MessageBox
@@ -1318,7 +1320,8 @@ def _parseFritzBoxPhonebook(self, html):
 		if found:
 			charset = found.group(1)
 			debug("[FritzCallFBF_05_50] _parseFritzBoxPhonebook: found charset: " + charset)
-			html = html2unicode(html.replace(chr(0xf6),'').decode(charset)).encode('utf-8')
+			if charset != 'utf-8':
+				html = html2unicode(html.replace(chr(0xf6),'').decode(charset)).encode('utf-8')
 		else: # this is kind of emergency conversion...
 			try:
 				debug("[FritzCallFBF_05_50] _parseFritzBoxPhonebook: try charset utf-8")

diff --git a/fritzcall/src/plugin.py b/fritzcall/src/plugin.py
@@ -2,9 +2,9 @@
 '''
 Update rev
 $Author: michael $
-$Revision: 773 $
-$Date: 2013-04-07 10:03:55 +0200 (Sun, 07 Apr 2013) $
-$Id: plugin.py 773 2013-04-07 08:03:55Z michael $
+$Revision: 777 $
+$Date: 2013-05-28 18:34:35 +0200 (Tue, 28 May 2013) $
+$Id: plugin.py 777 2013-05-28 16:34:35Z michael $
 '''
 
 
@@ -119,7 +119,7 @@ def getMountedDevs():
 	def handleMountpoint(loc):
 		# debug("[FritzCall] handleMountpoint: %s" %repr(loc))
 		mp = loc[0]
-		while mp[-1] == '/':
+		while len(mp) > 1 and mp[-1] == '/':
 			mp = mp[:-1]
 		#=======================================================================
 		# if os.path.exists(os.path.join(mp, "PhoneBook.txt")):
@@ -301,8 +301,8 @@ def __init__(self, session):
 		self["text"] = Label(
 							"FritzCall Plugin" + "\n\n" +
 							"$Author: michael $"[1:-2] + "\n" +
-							"$Revision: 773 $"[1:-2] + "\n" + 
-							"$Date: 2013-04-07 10:03:55 +0200 (Sun, 07 Apr 2013) $"[1:23] + "\n"
+							"$Revision: 777 $"[1:-2] + "\n" + 
+							"$Date: 2013-05-28 18:34:35 +0200 (Tue, 28 May 2013) $"[1:23] + "\n"
 							)
 		self["url"] = Label("http://wiki.blue-panel.com/index.php/FritzCall")
 		self.onLayoutFinish.append(self.setWindowTitle)
@@ -1884,7 +1884,7 @@ def __init__(self, session, args=None): #@UnusedVariable # pylint: disable=W0613
 
 	def setWindowTitle(self):
 		# TRANSLATORS: this is a window title.
-		self.setTitle(_("FritzCall Setup") + " (" + "$Revision: 773 $"[1: - 1] + "$Date: 2013-04-07 10:03:55 +0200 (Sun, 07 Apr 2013) $"[7:23] + ")")
+		self.setTitle(_("FritzCall Setup") + " (" + "$Revision: 777 $"[1: - 1] + "$Date: 2013-05-28 18:34:35 +0200 (Tue, 28 May 2013) $"[7:23] + ")")
 
 	def keyLeft(self):
 		ConfigListScreen.keyLeft(self)
@@ -2407,7 +2407,7 @@ def notifyAndReset(self, number, caller):
 
 class FritzProtocol(LineReceiver):
 	def __init__(self):
-		debug("[FritzProtocol] " + "$Revision: 773 $"[1:-1]	+ "$Date: 2013-04-07 10:03:55 +0200 (Sun, 07 Apr 2013) $"[7:23] + " starting")
+		debug("[FritzProtocol] " + "$Revision: 777 $"[1:-1]	+ "$Date: 2013-05-28 18:34:35 +0200 (Tue, 28 May 2013) $"[7:23] + " starting")
 		global mutedOnConnID
 		mutedOnConnID = None
 		self.number = '0'