[dist] Make use of property dist_info_file at save_info

Author: opacam

pythonforandroid/bootstrap.py

@@ -160,7 +160,7 @@ def prepare_dist_dir(self):
         ensure_dir(self.dist_dir)
 
     def run_distribute(self):
-        self.distribution.save_info(self.dist_dir)
+        self.distribution.save_info()
 
     @classmethod
     def all_bootstraps(cls):

pythonforandroid/distribution.py

@@ -258,30 +258,29 @@ def dist_info(self):
             dist_info = json.load(file_opened)
         return dist_info
 
-    def save_info(self, dirn):
+    def save_info(self):
         '''
         Save information about the distribution in its dist_dir.
         '''
-        with current_directory(dirn):
-            info('Saving distribution info')
-            with open('dist_info.json', 'w') as fileh:
-                json.dump(
-                    {'dist_name': self.name,
-                     'bootstrap': self.ctx.bootstrap.name,
-                     'archs': [arch.arch for arch in self.ctx.archs],
-                     'ndk_api': self.ctx.ndk_api,
-                     'android_api': self.ctx.android_api,
-                     'use_setup_py': self.ctx.use_setup_py,
-                     'recipes':
-                         self.ctx.recipe_build_order + self.ctx.python_modules,
-                     'hostpython': self.ctx.hostpython,
-                     'python_version':
-                         self.ctx.python_recipe.major_minor_version_string,
-                     },
-                    fileh,
-                    indent=4,
-                    sort_keys=True,
-                )
+        info('Saving distribution info')
+        with open(self.dist_info_file, 'w') as file_opened:
+            json.dump(
+                {'dist_name': self.name,
+                 'bootstrap': self.ctx.bootstrap.name,
+                 'archs': [arch.arch for arch in self.ctx.archs],
+                 'ndk_api': self.ctx.ndk_api,
+                 'android_api': self.ctx.android_api,
+                 'use_setup_py': self.ctx.use_setup_py,
+                 'recipes':
+                     self.ctx.recipe_build_order + self.ctx.python_modules,
+                 'hostpython': self.ctx.hostpython,
+                 'python_version':
+                     self.ctx.python_recipe.major_minor_version_string,
+                 },
+                file_opened,
+                indent=4,
+                sort_keys=True,
+            )
 
     def update_dist_info(self, key, value):
         """Update `dist_info.json` file values."""

tests/test_distribution.py

@@ -268,8 +268,10 @@ def test_save_info(self, mock_open_dist_info, mock_chdir):
         mock_open_dist_info.side_effect = [
             mock.mock_open(read_data=json.dumps(dist_info_data)).return_value
         ]
-        self.ctx.bootstrap.distribution.save_info("/fake_dir")
-        mock_open_dist_info.assert_called_once_with("dist_info.json", "w")
+        self.ctx.bootstrap.distribution.save_info()
+        mock_open_dist_info.assert_called_once_with(
+            self.ctx.bootstrap.distribution.dist_info_file, "w",
+        )
         mock_open_dist_info.reset_mock()
 
     @mock.patch("pythonforandroid.distribution.open", create=True)