Remove six and enum34 requirements

Author: python273

requirements.txt

@@ -1,5 +1,3 @@
 beautifulsoup4
 requests
-enum34;python_version<"3.4"
 websocket-client
-six

setup.py

@@ -38,7 +38,7 @@
     license='Apache License, Version 2.0, see LICENSE file',
 
     packages=['vk_api', 'jconfig'],
-    install_requires=['requests', 'enum34;python_version<"3.4"', 'six'],
+    install_requires=['requests'],
     extras_require={
         'vkstreaming': ['websocket-client'],
         'vkaudio': ['beautifulsoup4'],

vk_api/audio_url_decoder.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from six.moves import range
-
 from .exceptions import VkAudioUrlDecodeError
 
 VK_STR = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMN0PQRSTUVWXYZO123456789+/="

vk_api/execute.py

@@ -6,8 +6,6 @@
 :copyright: (c) 2019 python273
 """
 
-import six
-
 from .utils import sjson_dumps
 from .vk_api import VkApi, VkApiMethod
 
@@ -35,7 +33,7 @@ def __init__(self, code, args=None, clean_args=None, return_raw=False):
     def compile(self, args):
         compiled_args = {}
 
-        for key, value in six.iteritems(args):
+        for key, value in args.items():
             if key in self.clean_args:
                 compiled_args[key] = str(value)
             else:
@@ -74,7 +72,7 @@ def minify(code):
 def parse_args(function_args, args, kwargs):
     parsed_args = {}
 
-    for arg_name in six.iterkeys(kwargs):
+    for arg_name in kwargs.keys():
         if arg_name in function_args:
             parsed_args[arg_name] = kwargs[arg_name]
         else:

vk_api/keyboard.py

@@ -7,7 +7,6 @@
 
 from enum import Enum
 
-import six
 
 from .utils import sjson_dumps
 
@@ -109,7 +108,7 @@ def add_button(self, label, color=VkKeyboardColor.SECONDARY, payload=None):
         if isinstance(color, VkKeyboardColor):
             color_value = color_value.value
 
-        if payload is not None and not isinstance(payload, six.string_types):
+        if payload is not None and not isinstance(payload, str):
             payload = sjson_dumps(payload)
 
         button_type = VkKeyboardButton.TEXT.value
@@ -145,7 +144,7 @@ def add_callback_button(self, label, color=VkKeyboardColor.SECONDARY, payload=No
         if isinstance(color, VkKeyboardColor):
             color_value = color_value.value
 
-        if payload is not None and not isinstance(payload, six.string_types):
+        if payload is not None and not isinstance(payload, str):
             payload = sjson_dumps(payload)
 
         button_type = VkKeyboardButton.CALLBACK.value
@@ -174,7 +173,7 @@ def add_location_button(self, payload=None):
                 'This type of button takes the entire width of the line'
             )
 
-        if payload is not None and not isinstance(payload, six.string_types):
+        if payload is not None and not isinstance(payload, str):
             payload = sjson_dumps(payload)
 
         button_type = VkKeyboardButton.LOCATION.value
@@ -204,7 +203,7 @@ def add_vkpay_button(self, hash, payload=None):
                 'This type of button takes the entire width of the line'
             )
 
-        if payload is not None and not isinstance(payload, six.string_types):
+        if payload is not None and not isinstance(payload, str):
             payload = sjson_dumps(payload)
 
         button_type = VkKeyboardButton.VKPAY.value
@@ -242,7 +241,7 @@ def add_vkapps_button(self, app_id, owner_id, label, hash, payload=None):
                 'This type of button takes the entire width of the line'
             )
 
-        if payload is not None and not isinstance(payload, six.string_types):
+        if payload is not None and not isinstance(payload, str):
             payload = sjson_dumps(payload)
 
         button_type = VkKeyboardButton.VKAPPS.value
@@ -274,7 +273,7 @@ def add_openlink_button(self, label, link, payload=None):
         if len(current_line) >= MAX_BUTTONS_ON_LINE:
             raise ValueError(f'Max {MAX_BUTTONS_ON_LINE} buttons on a line')
 
-        if payload is not None and not isinstance(payload, six.string_types):
+        if payload is not None and not isinstance(payload, str):
             payload = sjson_dumps(payload)
 
         button_type = VkKeyboardButton.OPENLINK.value

vk_api/longpoll.py

@@ -11,8 +11,6 @@
 from enum import IntEnum
 
 import requests
-import six
-from six.moves import range
 
 CHAT_START_ID = int(2E9)  # id с которого начинаются беседы
 
@@ -300,7 +298,7 @@ class VkChatEventType(IntEnum):
 def get_all_event_attrs():
     keys = set()
 
-    for l in six.itervalues(EVENT_ATTRS_MAPPING):
+    for l in EVENT_ATTRS_MAPPING.values():
         keys.update(l)
 
     return tuple(keys)
@@ -309,7 +307,7 @@ def get_all_event_attrs():
 ALL_EVENT_ATTRS = get_all_event_attrs()
 
 PARSE_PEER_ID_EVENTS = [
-    k for k, v in six.iteritems(EVENT_ATTRS_MAPPING) if 'peer_id' in v
+    k for k, v in EVENT_ATTRS_MAPPING.items() if 'peer_id' in v
 ]
 PARSE_MESSAGE_FLAGS_EVENTS = [
     VkEventType.MESSAGE_FLAGS_REPLACE,
@@ -398,7 +396,7 @@ def _list_to_attr(self, raw, attrs):
             self.__setattr__(attrs[i], raw[i])
 
     def _dict_to_attr(self, values):
-        for k, v in six.iteritems(values):
+        for k, v in values.items():
             self.__setattr__(k, v)
 
     def _parse_peer_id(self):

vk_api/requests_pool.py

@@ -8,8 +8,6 @@
 
 from collections import namedtuple
 
-from six.moves import range
-
 from .exceptions import VkRequestsPoolException
 from .execute import VkFunction
 from .utils import sjson_dumps

vk_api/utils.py

@@ -10,17 +10,12 @@
 
 import random
 
-import six
-
 try:
     import simplejson as json
 except ImportError:
     import json
 
-try:
-    from http.cookiejar import Cookie
-except ImportError:  # python2
-    from cookielib import Cookie
+from http.cookiejar import Cookie
 
 
 def search_re(reg, string):
@@ -82,7 +77,7 @@ def sjson_dumps(*args, **kwargs):
 
 def cookie_to_dict(cookie):
     cookie_dict = {
-        k: v for k, v in six.iteritems(cookie.__dict__) if k in HTTP_COOKIE_ARGS
+        k: v for k, v in cookie.__dict__.items() if k in HTTP_COOKIE_ARGS
     }
 
     cookie_dict['rest'] = cookie._rest
@@ -148,10 +143,11 @@ def send(self, request, **kwargs):
                 body = body[:1024] + '[STRIPPED]'
 
             print(
-                '{:0.2f} {} {} {} {} {}'.format(
+                '{:0.2f} {} {} {} {} {} {}'.format(
                     total,
                     request.method,
                     request.url,
+                    request.headers,
                     repr(body),
                     response.status_code,
                     response.history

vk_api/vk_api.py

@@ -15,7 +15,6 @@
 import urllib.parse
 
 import requests
-import six
 
 import jconfig
 from .enums import VkUserPermissions
@@ -701,7 +700,7 @@ def __getattr__(self, method):
         )
 
     def __call__(self, **kwargs):
-        for k, v in six.iteritems(kwargs):
+        for k, v in kwargs.items():
             if isinstance(v, (list, tuple)):
                 kwargs[k] = ','.join(str(x) for x in v)