4.6.1

Delete windows line separator

Author: python273

.gitignore

@@ -6,3 +6,4 @@ upload_to_PyPi.py
 .project
 .pydevproject
 .settings/
+.idea/

MANIFEST

@@ -5,5 +5,4 @@ jconfig\jconfig.py
 test\test.py
 vk_api\__init__.py
 vk_api\vk_api.py
-vk_api\upload\__init__.py
-vk_api\upload\vk_upload.py
+vk_api\vk_upload.py

example.py

@@ -1,32 +1,32 @@
-'''
-@author: Kirill Python
-@contact: http://vk.com/python273
-@license Apache License, Version 2.0, see LICENSE file
-
-Copyright (C) 2013
-'''
-
-# -*- coding: utf-8 -*-
-import vk_api
-
-
-def main():
-    u""" Пример получения последнего сообщения со стены """
-
-    login = u'python@vk.com'
-    password = u'mypassword'
-
-    try:
-        vk = vk_api.VkApi(login, password)  # Авторизируемся
-    except vk_api.authorization_error as error_msg:
-        print(error_msg)  # В случае ошибки выведем сообщение
-        return  # и выйдем
-
-    values = {
-        'count': 1  # Получаем только одно сообщение
-    }
-    response = vk.method('wall.get', values)  # Используем метод wall.get
-    print(response[1]['text'])  # Печатаем текст последнего поста со стены
-
-if __name__ == '__main__':
-    main()
+'''
+@author: Kirill Python
+@contact: http://vk.com/python273
+@license Apache License, Version 2.0, see LICENSE file
+
+Copyright (C) 2013
+'''
+
+# -*- coding: utf-8 -*-
+import vk_api
+
+
+def main():
+    u""" Пример получения последнего сообщения со стены """
+
+    login = u'python@vk.com'
+    password = u'mypassword'
+
+    try:
+        vk = vk_api.VkApi(login, password)  # Авторизируемся
+    except vk_api.authorization_error as error_msg:
+        print(error_msg)  # В случае ошибки выведем сообщение
+        return  # и выйдем
+
+    values = {
+        'count': 1  # Получаем только одно сообщение
+    }
+    response = vk.method('wall.get', values)  # Используем метод wall.get
+    print(response[1]['text'])  # Печатаем текст последнего поста со стены
+
+if __name__ == '__main__':
+    main()

jconfig/__init__.py

@@ -1,19 +1,19 @@
-'''
-@author: Kirill Python
-@contact: http://vk.com/python273
-@license Apache License, Version 2.0, see LICENSE file
-
-Copyright (C) 2013
-'''
-
-__author__ = "Kirill Python"
-__version__ = "1.1"
-__email__ = "mikeking568@gmail.com"
-__contact__ = "https://vk.com/python273"
-
-
-import sys
-if sys.version_info[0] == 2:
-    from jconfig import *
-else:
-    from .jconfig import *
+'''
+@author: Kirill Python
+@contact: http://vk.com/python273
+@license Apache License, Version 2.0, see LICENSE file
+
+Copyright (C) 2013
+'''
+
+__author__ = "Kirill Python"
+__version__ = "1.1"
+__email__ = "mikeking568@gmail.com"
+__contact__ = "https://vk.com/python273"
+
+
+import sys
+if sys.version_info[0] == 2:
+    from jconfig import *
+else:
+    from .jconfig import *

jconfig/jconfig.py

@@ -1,42 +1,42 @@
-'''
-@author: Kirill Python
-@contact: http://vk.com/python273
-@license Apache License, Version 2.0, see LICENSE file
-
-Copyright (C) 2013
-'''
-
-# -*- coding: utf-8 -*-
-import os
-import json
-
-
-class config:
-    def __init__(self, section, filename='config'):
-        self.section = section  # Секция настроек
-        self.filename = filename  # Файл с настройками
-        self.all = self.parse()  # Все настройки
-        self.settings = self.all.get(section, {})  # Настройки секции
-
-    def __getitem__(self, item):
-        return self.settings.get(item, {})
-
-    def __setitem__(self, key, value):
-        self.settings.update({key: value})
-        self.all.update({self.section: self.settings})
-        self.update(self.all)
-
-    def parse(self):
-        fileis = os.path.exists(self.filename)
-        if fileis:
-            settings = json.load(open(self.filename, 'r'))
-            return settings
-        else:
-            self.update()
-            return {}
-
-    def update(self, settings=None):
-        if not settings:
-            settings = {}
-
-        json.dump(settings, open(self.filename, 'w'))
+'''
+@author: Kirill Python
+@contact: http://vk.com/python273
+@license Apache License, Version 2.0, see LICENSE file
+
+Copyright (C) 2013
+'''
+
+# -*- coding: utf-8 -*-
+import os
+import json
+
+
+class config(object):
+    def __init__(self, section, filename='config'):
+        self.section = section  # Секция настроек
+        self.filename = filename  # Файл с настройками
+        self.all = self.parse()  # Все настройки
+        self.settings = self.all.get(section, {})  # Настройки секции
+
+    def __getitem__(self, item):
+        return self.settings.get(item, {})
+
+    def __setitem__(self, key, value):
+        self.settings.update({key: value})
+        self.all.update({self.section: self.settings})
+        self.update(self.all)
+
+    def parse(self):
+        fileis = os.path.exists(self.filename)
+        if fileis:
+            settings = json.load(open(self.filename, 'r'))
+            return settings
+        else:
+            self.update()
+            return {}
+
+    def update(self, settings=None):
+        if not settings:
+            settings = {}
+
+        json.dump(settings, open(self.filename, 'w'))