The branch, frodo has been updated
       via  860a3813577b90ed11b3fd0643a31570f214f0b5 (commit)
      from  c4e59428e0dbd7409a7fd499841d0380f4858c21 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=860a3813577b90ed11b3fd0643a31570f214f0b5

commit 860a3813577b90ed11b3fd0643a31570f214f0b5
Author: Martijn Kaijser <[email protected]>
Date:   Sat May 24 17:51:07 2014 +0200

    [script.tvtunes] 4.4.5

diff --git a/script.tvtunes/addon.xml b/script.tvtunes/addon.xml
index aee1da2..b6f5d77 100644
--- a/script.tvtunes/addon.xml
+++ b/script.tvtunes/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.tvtunes" name="TvTunes" version="4.4.4" 
provider-name="Ppic,Frost,ronie,robwebset">
+<addon id="script.tvtunes" name="TvTunes" version="4.4.5" 
provider-name="Ppic,Frost,ronie,robwebset">
        <requires>
                <import addon="xbmc.python" version="2.1.0"/>
                <import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/script.tvtunes/changelog.txt b/script.tvtunes/changelog.txt
index 8ab45e5..40e381c 100644
--- a/script.tvtunes/changelog.txt
+++ b/script.tvtunes/changelog.txt
@@ -1,3 +1,6 @@
+v4.4.5
+- Fix OSX bug with python module name clash
+
 v4.4.4
 - Make sure there is only one username/password in smb shares
 - Play existing theme when using plugin theme browser to search for new theme
diff --git a/script.tvtunes/plugin.py b/script.tvtunes/plugin.py
index f02b200..1a362c7 100644
--- a/script.tvtunes/plugin.py
+++ b/script.tvtunes/plugin.py
@@ -37,8 +37,8 @@ from settings import os_path_split
 from settings import list_dir
 from settings import normalize_string
 
-from fetcher import TvTunesFetcher
-from finder import ThemeFiles
+from themeFetcher import TvTunesFetcher
+from themeFinder import ThemeFiles
 
 
 ###################################################################
diff --git a/script.tvtunes/resources/tvtunes_backend.py 
b/script.tvtunes/resources/tvtunes_backend.py
index b00af4d..c6372b1 100644
--- a/script.tvtunes/resources/tvtunes_backend.py
+++ b/script.tvtunes/resources/tvtunes_backend.py
@@ -34,7 +34,7 @@ from settings import os_path_split
 from settings import list_dir
 from settings import normalize_string
 
-from finder import ThemeFiles
+from themeFinder import ThemeFiles
 
 
 ###################################
diff --git a/script.tvtunes/resources/tvtunes_scraper.py 
b/script.tvtunes/resources/tvtunes_scraper.py
index 1251a80..16fa975 100644
--- a/script.tvtunes/resources/tvtunes_scraper.py
+++ b/script.tvtunes/resources/tvtunes_scraper.py
@@ -28,7 +28,7 @@ from settings import os_path_split
 from settings import list_dir
 from settings import normalize_string
 
-from fetcher import TvTunesFetcher
+from themeFetcher import TvTunesFetcher
 
 
 ###############################################################

-----------------------------------------------------------------------

Summary of changes:
 script.tvtunes/addon.xml                           |    2 +-
 script.tvtunes/changelog.txt                       |    3 +++
 script.tvtunes/plugin.py                           |    4 ++--
 .../resources/lib/{fetcher.py => themeFetcher.py}  |    0
 .../resources/lib/{finder.py => themeFinder.py}    |    0
 script.tvtunes/resources/tvtunes_backend.py        |    2 +-
 script.tvtunes/resources/tvtunes_scraper.py        |    2 +-
 7 files changed, 8 insertions(+), 5 deletions(-)
 rename script.tvtunes/resources/lib/{fetcher.py => themeFetcher.py} (100%)
 rename script.tvtunes/resources/lib/{finder.py => themeFinder.py} (100%)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to