Merge PR #892 into 12.0

Signed-off-by pedrobaeza

base_location_geonames_import/tests/test_base_location_geonames_import.py

@@ -81,10 +81,10 @@ class TestBaseLocationGeonamesImport(common.SavepointCase):
     def test_import_title(self):
         self.wizard.letter_case = 'title'
         self.wizard.with_context(max_import=1).run_import()
-        zip = self.env['res.city.zip'].search(
+        zip_entry = self.env['res.city.zip'].search(
             [('city_id.country_id', '=', self.country.id)], limit=1
         )
-        self.assertEqual(zip.city_id.name, zip.city_id.name.title())
+        self.assertEqual(zip_entry.city_id.name, zip_entry.city_id.name.title())
 
         city = self.env['res.city'].search(
             [('country_id', '=', self.country.id)], limit=1
@@ -94,10 +94,10 @@ class TestBaseLocationGeonamesImport(common.SavepointCase):
     def test_import_upper(self):
         self.wizard.letter_case = 'upper'
         self.wizard.with_context(max_import=1).run_import()
-        zip = self.env['res.city.zip'].search(
+        zip_entry = self.env['res.city.zip'].search(
             [('city_id.country_id', '=', self.country.id)], limit=1
         )
-        self.assertEqual(zip.city_id.name, zip.city_id.name.upper())
+        self.assertEqual(zip_entry.city_id.name, zip_entry.city_id.name.upper())
 
         city = self.env['res.city'].search(
             [('country_id', '=', self.country.id)], limit=1