avanzosc team mailing list archive
-
avanzosc team
-
Mailing list archive
-
Message #00484
[Merge] lp:~mikelarregi/avanzosc/nayar_mysql_connect into lp:~avanzosc-security-team/avanzosc/72horas
mikel arregi has proposed merging lp:~mikelarregi/avanzosc/nayar_mysql_connect into lp:~avanzosc-security-team/avanzosc/72horas.
Requested reviews:
Avanzosc_security (avanzosc-security-team)
For more details, see:
https://code.launchpad.net/~mikelarregi/avanzosc/nayar_mysql_connect/+merge/223770
nayar_mysql_connect
--
https://code.launchpad.net/~mikelarregi/avanzosc/nayar_mysql_connect/+merge/223770
Your team Avanzosc_security is requested to review the proposed merge of lp:~mikelarregi/avanzosc/nayar_mysql_connect into lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'nayar_mysql_connect/__init__.py'
--- nayar_mysql_connect/__init__.py 2014-06-11 10:23:47 +0000
+++ nayar_mysql_connect/__init__.py 2014-06-19 15:15:33 +0000
@@ -19,6 +19,6 @@
#
##############################################################################
-import mysql_connect
+from . import mysql_connect
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'nayar_mysql_connect/__openerp__.py'
--- nayar_mysql_connect/__openerp__.py 2014-06-11 10:23:47 +0000
+++ nayar_mysql_connect/__openerp__.py 2014-06-19 15:15:33 +0000
@@ -20,16 +20,12 @@
##############################################################################
{
- "name" : "Nayar MySql Connect",
- "version" : "1.0",
- "author" : "Nayar Systems",
- "category" : "Base",
- "website" : "",
+ "name": "Nayar MySql Connect",
+ "version": "1.0",
+ "author": "Nayar Systems",
+ "category": "Base",
+ "website": "",
"description": "This module allows you connect to a MySql database.",
- "depends" : ['dos_mysql_connect'],
- "init_xml" : [],
- "update_xml" : [],
- "active": False,
+ "depends": ['dos_mysql_connect'],
"installable": True
}
-
=== added directory 'nayar_mysql_connect/models'
=== renamed file 'nayar_mysql_connect/mysql_connect.py' => 'nayar_mysql_connect/models/mysql_connect.py'
--- nayar_mysql_connect/mysql_connect.py 2014-06-11 10:23:47 +0000
+++ nayar_mysql_connect/models/mysql_connect.py 2014-06-19 15:15:33 +0000
@@ -19,14 +19,15 @@
#
##############################################################################
-from osv import osv
-
-class mysql_connect(osv.osv):
+from openerp.osv import orm
+
+
+class MysqlConnect(orm.Models):
_inherit = 'mysql.connect'
db = None
def open_connection(self, cr, uid):
- self.db = super(mysql_connect, self).open_connection(cr, uid)
+ self.db = super(MysqlConnect, self).open_connection(cr, uid)
return self.db
def query(self, query_str, param=None):
@@ -51,8 +52,6 @@
return None
def close_connection(self, db=None):
- res = super(mysql_connect, self).close_connection(self.db)
+ res = super(MysqlConnect, self).close_connection(self.db)
self.db = None
return res
-
-mysql_connect()
Follow ups