Skip to content

Commit

Permalink
Merge branch 'python3'
Browse files Browse the repository at this point in the history
# Conflicts:
#	addon.xml
  • Loading branch information
romanvm committed Jan 17, 2021
2 parents 760092c + 04da380 commit 467b407
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions addon.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="plugin.video.example"
version="2.3.1"
version="2.4.0"
name="Example Kodi Video Plugin"
provider-name="Roman_V_M">
<requires>
<import addon="xbmc.python" version="2.25.0"/>
<import addon="xbmc.python" version="3.0.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="main.py">
<provides>video</provides>
Expand Down
13 changes: 6 additions & 7 deletions main.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
# Module: default
# Module: main
# Author: Roman V. M.
# Created on: 28.11.2014
# 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
from urllib import urlencode
from urlparse import parse_qsl
from urllib.parse import urlencode, parse_qsl
import xbmcgui
import xbmcplugin

Expand Down Expand Up @@ -65,7 +65,6 @@ def get_url(**kwargs):
Create a URL for calling the plugin recursively from the given set of keyword arguments.
:param kwargs: "argument=value" pairs
:type kwargs: dict
:return: plugin call URL
:rtype: str
"""
Expand All @@ -86,7 +85,7 @@ def get_categories():
:return: The list of video categories
:rtype: types.GeneratorType
"""
return VIDEOS.iterkeys()
return VIDEOS.keys()


def get_videos(category):
Expand Down

0 comments on commit 467b407

Please sign in to comment.