Browse Source

Merge pull request #88 from acsone/8.0-fix_pylint-jne

[FIX] pylint
pull/90/head
Pedro M. Baeza 10 years ago
parent
commit
15a8ff8fb0
  1. 3
      base_field_serialized/tests/__init__.py
  2. 2
      disable_openerp_online/__init__.py
  3. 2
      disable_openerp_online/model/__init__.py
  4. 2
      mass_editing/wizard/mass_editing_wizard.py
  5. 2
      users_ldap_populate/__init__.py
  6. 2
      users_ldap_populate/model/users_ldap.py

3
base_field_serialized/tests/__init__.py

@ -18,5 +18,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import test_serialized
from test_serialized import TestBaseFieldSerialized
from . import test_serialized

2
disable_openerp_online/__init__.py

@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import model
from . import model
from openerp.tools.misc import upload_data_thread
upload_data_thread.run = lambda x: None

2
disable_openerp_online/model/__init__.py

@ -18,4 +18,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import publisher_warranty_contract
from . import publisher_warranty_contract

2
mass_editing/wizard/mass_editing_wizard.py

@ -110,7 +110,7 @@ class MassEditingWizard(orm.TransientModel):
etree.SubElement(xml_group, 'field', {
'name': "selection__" + field.name,
'colspan': '2',
'colspan': '2'})
})
etree.SubElement(xml_group, 'field', {
'name': field.name, 'nolabel': '1',
'attrs': (

2
users_ldap_populate/__init__.py

@ -1 +1 @@
import model
from . import model

2
users_ldap_populate/model/users_ldap.py

@ -50,7 +50,7 @@ class CompanyLDAP(orm.Model):
if not conf['create_user']:
continue
attribute_match = re.search(
'([a-zA-Z_]+)=\%s', conf['ldap_filter'])
r'([a-zA-Z_]+)=\%s', conf['ldap_filter'])
if attribute_match:
login_attr = attribute_match.group(1)
else:

Loading…
Cancel
Save