Download as
Browse Code »

Commit b51e04b78a95869a3b285d786a1d1fe96f9fa97d

Authored by Gust
1 parent b46ed746
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fix flake8 warnings 

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Showing 14 changed files with 45 additions and 71 deletions   Show diff stats
colab/proxy/gitlab/data_api.py
  Diff comments   View file @b51e04b
... ... @@ -9,7 +9,7 @@ from django.conf import settings
9 9 from django.db.models.fields import DateTimeField
10 10  
11 11 from colab.proxy.gitlab.models import GitlabProject
12   -from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
  12 +from colab.proxy.utils.proxy_data_api import ProxyDataAPI
13 13  
14 14  
15 15 class GitlabDataAPI(ProxyDataAPI):
... ...
colab/proxy/jenkins/data_api.py
  Diff comments   View file @b51e04b
1   -from colab.proxy.gitlab.models import *
2   -from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
3   -from django.db.models.fields import DateTimeField
4   -from dateutil.parser import parse
5   -import urllib2
6   -import json
  1 +from colab.proxy.utils.proxy_data_api import ProxyDataAPI
7 2  
8   -class JenkinsDataAPI(ProxyDataAPI):
9 3  
10   - def fetchData(self):
11   - pass
  4 +class JenkinsDataAPI(ProxyDataAPI):
12 5  
  6 + def fetchData(self):
  7 + pass
... ...
colab/proxy/management/__init__.py 0 → 100644
  Diff comments   View file @b51e04b
colab/proxy/management/commands/__init__.py 0 → 100644
  Diff comments   View file @b51e04b
colab/proxy/management/commands/import_proxy_data.py 0 → 100644
  Diff comments   View file @b51e04b
... ... @@ -0,0 +1,21 @@
  1 +#!/usr/bin/env python
  2 +
  3 +import colab
  4 +from django.core.management.base import BaseCommand
  5 +from colab.super_archives.models import Message
  6 +from django.conf import settings
  7 +modules = [ i for i in settings.INSTALLED_APPS if i.startswith("colab.proxy.") ]
  8 +for module in modules:
  9 + module += ".data_api"
  10 + __import__(module, locals(), globals())
  11 +
  12 +class Command(BaseCommand):
  13 + help = "Import proxy data into colab database"
  14 +
  15 + def handle(self, *args, **kwargs):
  16 + print "Executing extraction command..."
  17 +
  18 + for module in modules:
  19 + extractionClassname = module + ".data_api." + module.split('.')[-1].title() + "DataAPI"
  20 + api = eval(extractionClassname)()
  21 + api.fetchData()
... ...
colab/proxy/noosfero/data_api.py
  Diff comments   View file @b51e04b
1   -from colab.proxy.gitlab.models import *
2   -from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
3   -from django.db.models.fields import DateTimeField
4   -from dateutil.parser import parse
5   -import urllib2
6   -import json
  1 +from colab.proxy.utils.proxy_data_api import ProxyDataAPI
7 2  
8   -class NoosferoDataAPI(ProxyDataAPI):
9 3  
10   - def fetchData(self):
11   - pass
  4 +class NoosferoDataAPI(ProxyDataAPI):
12 5  
  6 + def fetchData(self):
  7 + pass
... ...
colab/proxy/proxybase/__init__.py
View file @b46ed74
colab/proxy/proxybase/management/commands/__init__.py
View file @b46ed74
... ... @@ -1 +0,0 @@
1   -__init__.py
2 0 \ No newline at end of file
colab/proxy/proxybase/management/commands/import_proxy_data.py
View file @b46ed74
... ... @@ -1,26 +0,0 @@
1   -#!/usr/bin/env python
2   -
3   -import importlib
4   -
5   -from django.core.management.base import BaseCommand
6   -from django.conf import settings
7   -
8   -from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
9   -
10   -
11   -class Command(BaseCommand):
12   - help = "Import proxy data into colab database"
13   -
14   - def handle(self, *args, **kwargs):
15   - print "Executing extraction command..."
16   -
17   - for module_name in settings.PROXIED_APPS.keys():
18   - module_path = 'colab.proxy.{}.data_api'.format(module_name)
19   - module = importlib.import_module(module_path)
20   -
21   - for module_item_name in dir(module):
22   - module_item = getattr(module, module_item_name)
23   - if issubclass(module_item, ProxyDataAPI):
24   - if module_item != ProxyDataAPI:
25   - api = module_item()
26   - api.fetchData()
colab/proxy/proxybase/proxy_data_api.py
View file @b46ed74
... ... @@ -1,6 +0,0 @@
1   -
2   -
3   -class ProxyDataAPI(object):
4   -
5   - def fetchData(self):
6   - raise NotImplementedError('fetchData not yet implemented')
colab/proxy/redmine/data_api.py
  Diff comments   View file @b51e04b
1   -from colab.proxy.gitlab.models import *
2   -from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
3   -from django.db.models.fields import DateTimeField
4   -from dateutil.parser import parse
5   -import urllib2
6   -import json
  1 +from colab.proxy.utils.proxy_data_api import ProxyDataAPI
7 2  
8   -class RedmineDataAPI(ProxyDataAPI):
9 3  
10   - def fetchData(self):
11   - pass
  4 +class RedmineDataAPI(ProxyDataAPI):
12 5  
  6 + def fetchData(self):
  7 + pass
... ...
colab/proxy/trac/data_api.py
  Diff comments   View file @b51e04b
1   -from colab.proxy.gitlab.models import *
2   -from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
3   -from django.db.models.fields import DateTimeField
4   -from dateutil.parser import parse
5   -import urllib2
6   -import json
  1 +from colab.proxy.utils.proxy_data_api import ProxyDataAPI
7 2  
8   -class TracDataAPI(ProxyDataAPI):
9 3  
10   - def fetchData(self):
11   - pass
  4 +class TracDataAPI(ProxyDataAPI):
12 5  
  6 + def fetchData(self):
  7 + pass
... ...
colab/proxy/utils/proxy_data_api.py 0 → 100644
  Diff comments   View file @b51e04b
... ... @@ -0,0 +1,6 @@
  1 +
  2 +
  3 +class ProxyDataAPI(object):
  4 +
  5 + def fetchData(self):
  6 + raise NotImplementedError('fetchData not yet implemented')
... ...
colab/settings.py
  Diff comments   View file @b51e04b
... ... @@ -323,5 +323,5 @@ if FEEDZILLA_ENABLED:
323 323 PROXIED_APPS = locals().get('PROXIED_APPS') or {}
324 324 BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
325 325  
326   -for app_label in proxied_apps.keys():
  326 +for app_label in PROXIED_APPS.keys():
327 327 INSTALLED_APPS += ('colab.proxy.{}'.format(app_label),)
... ...