Merge remote-tracking branch 'upstream/matrix' into matrix

Author: lusum

plugin.video.catchuptvandmore/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.catchuptvandmore" name="Catch-up TV &amp; More" version="0.2.41+matrix.1" provider-name="SylvainCecchetto,wwark,joaopa">
+<addon id="plugin.video.catchuptvandmore" name="Catch-up TV &amp; More" version="0.2.41.1+matrix.1" provider-name="SylvainCecchetto,wwark,joaopa">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.codequick" version="0.9.13"/>
@@ -42,9 +42,8 @@
     <email>catch.up.tv.and.more at gmail dot com</email>
     <source>https://github.com/Catch-up-TV-and-More/plugin.video.catchuptvandmore</source>
     <news>
-[Version 0.2.41]
-Changelog is too big for this version.
-See https://github.com/Catch-up-TV-and-More/plugin.video.catchuptvandmore/releases/tag/v0.2.40 from the changelog.
+[Version 0.2.41.1]
+Fix an import error
     </news>
     <assets>
       <icon>icon.png</icon>

plugin.video.catchuptvandmore/resources/lib/menu_utils.py

@@ -15,9 +15,6 @@
 from resources.lib.addon_utils import get_item_label
 import resources.lib.favourites as fav
 from resources.lib.kodi_utils import get_kodi_version
-# delete_for_submission_start
-from resources.lib.vpn import add_vpn_context
-# delete_for_submission_end
 
 MENUS_SETTINGS_FP = os.path.join(Script.get_info('profile'), "menus_settings.json")
 
@@ -213,11 +210,6 @@ def add_context_menus_to_item(item, item_id, item_index, menu_id, menu_len, is_p
                         item_id=item_id,
                         menu_id=menu_id)
 
-    # delete_for_submission_start
-    # Connect/Disconnect VPN
-    add_vpn_context(item)
-    # delete_for_submission_end
-
     # Add to add-on favourites
     item.context.script(fav.add_item_to_favourites,
                         Script.localize(30800),
@@ -249,11 +241,6 @@ def item_post_treatment(item, is_playable=False, is_downloadable=False):
                         Script.localize(30800),
                         is_playable=is_playable)
 
-    # delete_for_submission_start
-    # Connect/Disconnect VPN
-    add_vpn_context(item)
-    # delete_for_submission_end
-
     return