Restructuralization

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
 *.egg-info
+.env

setup.py

@@ -13,4 +13,5 @@
     install_requires=[],
     tests_require=[],
     include_package_data=True,
+    test_suite="tests",
 )

sklikapi/__init__.py

@@ -1,23 +0,0 @@
-
-from config import Config
-from client import Client
-from errors import SklikApiError
-from methods.methods import Missing
-from methods.admethods import Ad, AdStat
-from methods.campaignmethods import Campaign, CampaignRegionPolygonVertex, \
-                                    CampaignRegion, CampaignStat
-from methods.conversionmethods import Conversion, ConversionType
-from methods.groupmethods import Group, GroupStat
-from methods.keywordmethods import Keyword, KeywordStat
-from methods.miscmethods import SearchService
-
-__all__ = [
-    "Config", "Client", "SklikApiError", "Missing",
-    "Ad", "AdStat",
-    "Campaign", "CampaignRegionPolygonVertex", "CampaignRegion", "CampaignStat",
-    "Conversion", "ConversionType",
-    "Group", "GroupStat",
-    "Keyword", "KeywordStat",
-    "SearchService",
-]
-

sklikapi/bajaja/__init__.py

@@ -0,0 +1,23 @@
+
+from config import Config
+from client import Client
+from errors import SklikApiError
+from methods.methods import Missing
+from methods.admethods import Ad, AdStat
+from methods.campaignmethods import Campaign, CampaignRegionPolygonVertex, \
+                                    CampaignRegion, CampaignStat
+from methods.conversionmethods import Conversion, ConversionType
+from methods.groupmethods import Group, GroupStat
+from methods.keywordmethods import Keyword, KeywordStat
+from methods.miscmethods import SearchService
+
+__all__ = [
+    "Config", "Client", "SklikApiError", "Missing",
+    "Ad", "AdStat",
+    "Campaign", "CampaignRegionPolygonVertex", "CampaignRegion", "CampaignStat",
+    "Conversion", "ConversionType",
+    "Group", "GroupStat",
+    "Keyword", "KeywordStat",
+    "SearchService",
+]
+

sklikapi/errors.py → sklikapi/bajaja/errors.py

@@ -1,92 +1,72 @@
-
 class SklikApiError(Exception):
-    """Base Sklik API error exception class
-    """
-
+    """Base Sklik API error exception"""
     pass
-#endclass
+
 
 class SklikApiWarning(Warning):
-    """Base Sklik API warning exception class
-    """
+    """Base Sklik API warning exception"""
+    pass
 
+
+class IncompatibleApiVersionError(SklikApiError):
+    """Sklik API has incompatible version error exception"""
     pass
-#endclass
 
-class NotFoundError(SklikApiError):
-    """Sklik API not found error exception
-    """
 
+class NotFoundError(SklikApiError):
+    """Sklik API not found error exception"""
     pass
-#endclass
+
 
 class ArgumentError(SklikApiError):
-    """Sklik API argument error exception
-    """
+    """Sklik API argument error exception"""
 
     __slots__ = ["__errors"]
 
     def __init__(self, message, errors):
         SklikApiError.__init__(self, message)
         self.__errors = errors
-    #enddef
 
     def errors(self):
         return self.__errors
-    #enddef
 
     def __str__(self):
         s = super(ArgumentError, self).__str__()
         return '; '.join([s] + self.__errors)
-    #enddef
 
-#endclass
 
 class InvalidDataError(SklikApiError):
-    """Sklik API invalid data error exception
-    """
+    """Sklik API invalid data error exception"""
 
     __slots__ = ["__errors"]
 
     def __init__(self, message, errors):
         SklikApiError.__init__(self, message)
         self.__errors = errors
-    #enddef
 
     def errors(self):
         return self.__errors
-    #enddef
 
     def __str__(self):
         s = super(InvalidDataError, self).__str__()
         return '; '.join([s] + [e['id'] for e in self.__errors])
-    #enddef
-#endclass
 
-class AuthenticationError(SklikApiError):
-    """Sklik API authentication error exception
-    """
 
+class AuthenticationError(SklikApiError):
+    """Sklik API authentication error exception"""
     pass
-#endclass
 
-class SessionError(SklikApiError):
-    """Sklik API session error exception
-    """
 
+class SessionError(SklikApiError):
+    """Sklik API session error exception"""
     pass
-#endclass
 
-class AccessError(SklikApiError):
-    """Skik API access error exception
-    """
 
+class AccessError(SklikApiError):
+    """Skik API access error exception"""
     pass
-#endclass
 
-class NoActionWarning(SklikApiWarning):
-    """Sklik API no action error exception
-    """
 
+class NoActionWarning(SklikApiWarning):
+    """Sklik API no action error exception"""
     pass
-#endclass

sklikapi/methods/admethods.py → sklikapi/bajaja/methods/admethods.py

@@ -5,27 +5,18 @@ class Ad(object):
     """Ad class
 
     Attributes:
-
         id: ad ID
-
         creative1: ad title
-
         creative2: ad line 1
-
         creative3: ad line 2
-
         clickthruUrl: destination URL
-
         clickthruText: visible URL
-
         removed: whether is removed
-
         status: ad status
-
         created: creation date
-
         groupId: group ID
     """
+
     __slots__ = [
         "id",
         "creative1",
@@ -42,27 +33,20 @@ class Ad(object):
     def __init__(self):
         for attr in self.__slots__:
             setattr(self, attr, Missing)
-        #endfor
-    #enddef
-#endclass
+
 
 class AdStat(object):
     """Ad stat class
 
     Attributes:
-
         conversions: conversion count
-
         transactions: transaction count
-
         money: money sum
-
         avgPosition: average position
-
         impressions: impression count
-
         clicks: click count
     """
+
     __slots__ = [
         "conversions",
         "transactions",
@@ -79,12 +63,11 @@ def __init__(self):
         self.avgPosition = 0
         self.impressions = 0
         self.clicks = 0
-    #enddef
-#endclass
+
 
 class AdMethods(Methods):
     @convert(Ad)
-    def checkAd(self, attributes):
+    def check_ad(self, attributes):
         """Checks ad attributes
 
         Arguments: