Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change async to aasync for python3 7 compability #840

Open
wants to merge 2 commits into
base: 11.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion auth_oauth_check_client_id/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'auth_oauth - check client_id',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Ivan Yelizariev, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion auth_oauth_ip/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"summary": """Allows to check access_token by requests in local network""",
"category": "Extra Tools",
"images": [],
"version": "11.0.1.0.0",
"version": "12.0.1.0.0",
"author": "IT-Projects LLC, Ivan Yelizariev, Nicolas JEUDY",
"support": "apps@it-projects.info",
"website": "https://it-projects.info",
Expand Down
2 changes: 1 addition & 1 deletion oauth_provider/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'OAuth2 provider',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Ivan Yelizariev',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_client/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Client',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Ivan Yelizariev, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Portal',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Ivan Yelizariev, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
4 changes: 2 additions & 2 deletions saas_portal/models/saas_portal.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from odoo import api, exceptions, fields, models
from odoo.tools import scan_languages
from odoo.tools.translate import _
from odoo.addons.base.res.res_partner import _tz_get
from odoo.addons.base.models.res_partner import _tz_get
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT

from odoo.addons.saas_base.exceptions import MaximumTrialDBException
Expand Down Expand Up @@ -288,7 +288,7 @@ def create_new_database(self, **kwargs):
@api.multi
def _create_new_database(self, dbname=None, client_id=None,
partner_id=None, user_id=None, notify_user=True,
trial=False, support_team_id=None, async=None):
trial=False, support_team_id=None, aasync=None):
self.ensure_one()
p_client = self.env['saas_portal.client']
p_server = self.env['saas_portal.server']
Expand Down
2 changes: 1 addition & 1 deletion saas_portal/wizard/config_wizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def apply(self):
user_id=self.user_id.id,
notify_user=self.notify_user,
support_team_id=self.support_team_id.id,
async=self.async_creation,
aasync=self.async_creation,
trial=self.trial)
if self.async_creation:
return
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_async/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Portal Asynchronous database creation',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'IT-Projects LLC, Nicolas JEUDY',
"support": "apps@it-projects.info",
'website': "https://it-projects.info",
Expand Down
8 changes: 4 additions & 4 deletions saas_portal_async/models/saas_portal_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ class SaasPortalPlan(models.Model):
_inherit = 'saas_portal.plan'

@api.multi
def create_new_database(self, async=None, **kwargs):
if async:
def create_new_database(self, aasync=None, **kwargs):
if aasync:
session = ConnectorSession(self._cr, self._uid, self._context)
job_uuid = async_client_create.delay(
session, self._name, self.id, async=async, **kwargs)
session, self._name, self.id, aasync=aasync, **kwargs)
else:
res = super(SaasPortalPlan, self)._create_new_database(
async=async, **kwargs)
aasync=aasync, **kwargs)
return res
2 changes: 1 addition & 1 deletion saas_portal_backup/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Portal backup',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Salton Massally <smassally@idtlabs.sl> (iDT Labs), Nicolas JEUDY',
'license': 'GPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_demo/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"summary": """All you need to create demos for your applications in odoo apps store""",
"category": "SaaS",
"images": [],
"version": "11.0.1.0.0",
"version": "12.0.1.0.0",

"author": "IT-Projects LLC, Cesar Lage, Ivan Yelizariev, Nicolas JEUDY",
"website": "https://it-projects.info",
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_sale/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"support": "apps@it-projects.info",
'website': "https://twitter.com/nasyrov_ildar",
'category': 'SaaS',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'depends': [
'sale',
'saas_portal',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_sale_online/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"support": "apps@it-projects.info",
'website': "https://twitter.com/nasyrov_ildar",
'category': 'SaaS',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'depends': ['website_sale', 'saas_portal', 'saas_portal_sale', 'website_sale_require_login'],
'data': [
'views/templates.xml',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_sale_subscription/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Portal Sale Subscription',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'PlanetaTIC, IT-Projects LLC, Ildar Nasyrov, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_signup/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Portal Sign Up',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Cesar Lage, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_start/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Portal - /page/start',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Ivan Yelizariev, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_subscription/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Portal Subscription',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'PlanetaTIC, Ivan Yelizariev, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_tagging/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
'name': 'SaaS Portal Tagging',
'summary': "Ability to tag client databases",
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Salton Massally <salton.massally@gmail.com>, Nicolas JEUDY',
'license': 'GPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_portal_templates/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
{
'name': 'SaaS Portal - templates',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Ivan Yelizariev, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_server/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Server',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Ivan Yelizariev, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_server_autodelete/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Server - Autodelete expired databases',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Ivan Yelizariev, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_server_backup_ftp/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"support": "apps@it-projects.info",
'website': "https://twitter.com/nasyrov_ildar",
'category': 'SaaS',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'depends': ['saas_server'],
"external_dependencies": {"python": ['pysftp'], "bin": []},
'data': [
Expand Down
2 changes: 1 addition & 1 deletion saas_server_backup_rotate/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Server Rotate Backup',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Salton Masssally, Nicolas JEUDY',
'license': 'GPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_server_backup_rotate_s3/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Server Rotate Backup S3',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Salton Masssally, Nicolas JEUDY',
'license': 'GPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_server_backup_s3/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'SaaS Server Backup S3',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Salton Massally, Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_server_demo/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"summary": """new parameters in __openerp__.py for demonstrative modules, control repositories for demonstration""",
"category": "SaaS",
"images": [],
"version": "11.0.1.0.0",
"version": "12.0.1.0.0",

"author": "IT-Projects LLC, Ildar Nasyrov, Nicolas JEUDY",
"website": "https://it-projects.info",
Expand Down
2 changes: 1 addition & 1 deletion saas_sysadmin/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
'name': 'SaaS System Administration',
'summary': "System Administration Framework for SAAS Tools",
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Salton Massally <smassally@idtlabs.sl> (iDT Labs), Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down
2 changes: 1 addition & 1 deletion saas_sysadmin_aws/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"support": "apps@it-projects.info",
'website': "https://twitter.com/nasyrov_ildar",
'category': 'SaaS',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'depends': ['saas_portal'],
'data': [
'views/res_config.xml',
Expand Down
2 changes: 1 addition & 1 deletion saas_sysadmin_aws_route53/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"summary": """This module can be used by other SaaS modules when DNS needed""",
"category": "SaaS",
"images": [],
"version": "11.0.1.0.0",
"version": "12.0.1.0.0",

"author": "IT-Projects LLC, Ildar Nasyrov, Nicolas JEUDY",
"support": "apps@it-projects.info",
Expand Down
2 changes: 1 addition & 1 deletion saas_sysadmin_mailgun/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"summary": """This module configurates new databases for clients such as their users can send and receive mails""",
"category": "SaaS",
"images": [],
"version": "11.0.1.0.0",
"version": "12.0.1.0.0",

"author": "IT-Projects LLC, Ildar Nasyrov, Nicolas JEUDY",
"support": "apps@it-projects.info",
Expand Down
2 changes: 1 addition & 1 deletion saas_sysadmin_route53/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
'name': 'SaaS System Administration Route 53',
'summary': "Aws Route 53 integration for SAAS Tools",
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Salton Massally <smassally@idtlabs.sl> (iDT Labs), Nicolas JEUDY',
'license': 'LGPL-3',
'category': 'SaaS',
Expand Down