RussakHH stable roll-back 2

resources/__init__.py

@@ -0,0 +1,5 @@
+#-*- coding: utf-8 -*-
+'''
+    Torrenter v2 plugin for XBMC/Kodi
+    Copyright (C) 2015 DiMartino
+'''

resources/language/English/strings.xml

@@ -44,6 +44,10 @@
     <string id="30044">Save files</string>
     <string id="30045">Ask to save</string>
     <string id="30046">BTclient (python-libtorrent via http)</string>
+    <string id="30047">Auto-unblocking proxy</string>
+    <string id="30048">None</string>
+    <string id="30049">Anti-zapret</string>
+    <string id="30050">Immunicity</string>
     <string id="30101">Interface</string>
     <string id="30102">P2P Network</string>
     <string id="30103">Advanced</string>
@@ -69,4 +73,5 @@
     <string id="30418">Choose searcher</string>
     <string id="30419">You don't have external searcher. Please install it first.</string>
 
+
 </strings>

resources/language/Russian/strings.xml

@@ -44,6 +44,10 @@
     <string id="30044">Сохранять файлы</string>
     <string id="30045">Спросить о сохранении</string>
     <string id="30046">BTclient (python-libtorrent по http)</string>
+    <string id="30047">Антизапрет (прокси)</string>
+    <string id="30048">Не использовать</string>
+    <string id="30049">Anti-zapret</string>
+    <string id="30050">Immunicity</string>
     <string id="30101">Интерфейс</string>
     <string id="30102">P2P Сеть</string>
     <string id="30103">Дополнительные</string>

resources/scrapers/fuzzywuzzy/StringMatcher.py

@@ -7,9 +7,11 @@ ported from python-Levenshtein
 [https://github.com/miohtama/python-Levenshtein]
 """
 
-from Levenshtein import *
 from warnings import warn
 
+from Levenshtein import *
+
+
 class StringMatcher:
     """A SequenceMatcher-like class built on the top of Levenshtein"""
 

resources/scrapers/fuzzywuzzy/fuzz.py

@@ -25,12 +25,10 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 from __future__ import unicode_literals
-import warnings
 
 try:
     from .StringMatcher import StringMatcher as SequenceMatcher
 except ImportError:
-    #warnings.warn('Using slow pure-python SequenceMatcher. Install python-Levenshtein to remove this warning')
     from difflib import SequenceMatcher
 
 from . import utils

resources/scrapers/kinopoisk/pageparser.py

@@ -34,6 +34,7 @@ import translit
 
 
 
+
 # MATCHER_MOVIE_DURATION = re.compile('\s*(\d+).*?', re.UNICODE | re.DOTALL)
 # MATCHER_IMDB_RATING = re.compile('IMDb:\s*(\d+\.?\d*)\s*\(\s*([\s\d]+)\s*\)', re.UNICODE | re.DOTALL)
 # MATCHER_IMDB_RATING = re.compile('IMDb:\s*(\d+\.?\d*)\s?\((.*)\)', re.UNICODE)

resources/settings.xml

@@ -11,6 +11,7 @@
         <setting id="timeout"           type="enum"     lvalues="30026|30027|30028" label="30025" default="1"/>
         <setting id="search_phrase"     type="text"     label="30040"/>
         <setting id="num_threads"       type="slider"   label="30042" default="3" range="1,1,9" option="int"/>
+        <setting id="proxy"             type="enum"     lvalues="30048|30049|" label="30047" default="0"/>
         <setting id="debug"             type="bool"     label="30015" default="false"/>
     </category>
     <category label="30102">

resources/skins/DialogReviews.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import sys, urllib, urllib2, re, os, cookielib, traceback, datetime, htmlentitydefs
-import xbmc, xbmcgui, xbmcaddon
+import re
+import htmlentitydefs
+
+import xbmcgui
 
 pattern = re.compile("&(\w+?);")
 

resources/utorrent/__init__.py

@@ -0,0 +1,5 @@
+#-*- coding: utf-8 -*-
+'''
+    Torrenter v2 plugin for XBMC/Kodi
+    Copyright (C) 2015 DiMartino
+'''

resources/utorrent/dopal/class_defs.py

@@ -58,7 +58,6 @@ source file.
 # class_defs_make.py.
 #
 
-import dopal.classes
 from dopal.aztypes import AzMethod as _method
 from dopal.aztypes import AzureusMethods