diff --git a/prismedia/pt_upload.py b/prismedia/pt_upload.py index e6acd92..ae49140 100644 --- a/prismedia/pt_upload.py +++ b/prismedia/pt_upload.py @@ -16,12 +16,8 @@ from requests_toolbelt.multipart.encoder import MultipartEncoder from . import utils from six.moves import configparser -import six -if six.PY2: - ConfigParser = configparser.SafeConfigParser -else: - ConfigParser = configparser.ConfigParser +ConfigParser = configparser.RawConfigParser PEERTUBE_SECRETS_FILE = 'peertube_secret' PEERTUBE_PRIVACY = { diff --git a/prismedia/upload.py b/prismedia/upload.py index 14b0d3b..2902519 100755 --- a/prismedia/upload.py +++ b/prismedia/upload.py @@ -87,7 +87,7 @@ except ImportError: 'see https://github.com/ahupp/python-magic\n') exit(1) -VERSION = "prismedia v0.6.1-1" +VERSION = "prismedia v0.6.2" VALID_PRIVACY_STATUSES = ('public', 'private', 'unlisted') VALID_CATEGORIES = ( diff --git a/prismedia/utils.py b/prismedia/utils.py index d4f84f7..8d0d092 100644 --- a/prismedia/utils.py +++ b/prismedia/utils.py @@ -1,3 +1,4 @@ +#!/usr/bin/python # coding: utf-8 from ConfigParser import RawConfigParser, NoOptionError, NoSectionError @@ -8,14 +9,10 @@ from subprocess import check_call, CalledProcessError, STDOUT import unidecode import logging from six.moves import configparser -import six -if six.PY2: - ConfigParser = configparser.SafeConfigParser -else: - ConfigParser = configparser.ConfigParser +ConfigParser = configparser.RawConfigParser -### CATEGORIES ### +# CATEGORIES # YOUTUBE_CATEGORY = { "music": 10, "films": 1,