Merge branch 'python3'

# Conflicts:
#	addon.xml
This commit is contained in:
Roman 2021-01-17 08:29:32 +02:00
commit 467b4073f8
2 changed files with 8 additions and 9 deletions

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<addon id="plugin.video.example" <addon id="plugin.video.example"
version="2.3.1" version="2.4.0"
name="Example Kodi Video Plugin" name="Example Kodi Video Plugin"
provider-name="Roman_V_M"> provider-name="Roman_V_M">
<requires> <requires>
<import addon="xbmc.python" version="2.25.0"/> <import addon="xbmc.python" version="3.0.0"/>
</requires> </requires>
<extension point="xbmc.python.pluginsource" library="main.py"> <extension point="xbmc.python.pluginsource" library="main.py">
<provides>video</provides> <provides>video</provides>

13
main.py
View File

@ -1,12 +1,12 @@
# -*- coding: utf-8 -*- # Module: main
# Module: default
# Author: Roman V. M. # Author: Roman V. M.
# Created on: 28.11.2014 # Created on: 28.11.2014
# License: GPL v.3 https://www.gnu.org/copyleft/gpl.html # License: GPL v.3 https://www.gnu.org/copyleft/gpl.html
"""
Example video plugin that is compatible with Kodi 19.x "Matrix" and above
"""
import sys import sys
from urllib import urlencode from urllib.parse import urlencode, parse_qsl
from urlparse import parse_qsl
import xbmcgui import xbmcgui
import xbmcplugin import xbmcplugin
@ -65,7 +65,6 @@ def get_url(**kwargs):
Create a URL for calling the plugin recursively from the given set of keyword arguments. Create a URL for calling the plugin recursively from the given set of keyword arguments.
:param kwargs: "argument=value" pairs :param kwargs: "argument=value" pairs
:type kwargs: dict
:return: plugin call URL :return: plugin call URL
:rtype: str :rtype: str
""" """
@ -86,7 +85,7 @@ def get_categories():
:return: The list of video categories :return: The list of video categories
:rtype: types.GeneratorType :rtype: types.GeneratorType
""" """
return VIDEOS.iterkeys() return VIDEOS.keys()
def get_videos(category): def get_videos(category):