[dist] Convert get_dist_info into the cls property dist_info

So we can reduce the a little more the complexity of cls `Distribution`

Author: opacam

pythonforandroid/distribution.py

@@ -251,11 +251,10 @@ def dist_info_file(self):
         """Return the path of the distribution `dist_info.json` file."""
         return str(Path(self.dist_dir, 'dist_info.json'))
 
-    @staticmethod
-    def get_dist_info(dist_dir):
-        """Load `dist_info.json` file given a dist path."""
-        dist_json_file = str(Path(dist_dir, 'dist_info.json'))
-        with open(dist_json_file, 'r') as file_opened:
+    @property
+    def dist_info(self):
+        """Load the Distribution's `dist_info.json` file."""
+        with open(self.dist_info_file, 'r') as file_opened:
             dist_info = json.load(file_opened)
         return dist_info
 
@@ -285,12 +284,12 @@ def save_info(self, dirn):
                 )
 
     def update_dist_info(self, key, value):
-        """Update `dist_info.json` values."""
-        dist_info = self.get_dist_info(self.dist_dir)
+        """Update `dist_info.json` file values."""
+        new_dist_info = self.dist_info.copy()
 
-        dist_info[key] = value
+        new_dist_info[key] = value
         with open(self.dist_info_file, 'w') as file_opened:
-            json.dump(dist_info, file_opened, indent=4, sort_keys=True)
+            json.dump(new_dist_info, file_opened, indent=4, sort_keys=True)
 
     def update_dist_project_properties_android_api(self, new_android_api):
         """Update `project.properties` with a new android api."""

tests/test_distribution.py

@@ -103,20 +103,21 @@ def test_dist_info_file(self):
             os.path.join(distribution.dist_dir, "dist_info.json")
         )
 
-    @mock.patch("pythonforandroid.distribution.open", create=True)
-    def test_get_dist_info(self, mock_open):
+    def test_dist_info(self):
         """Test that method
-        :meth:`~pythonforandroid.distribution.Distribution.get_dist_info`
+        :meth:`~pythonforandroid.distribution.Distribution.dist_info`
         calls the proper methods and returns the proper value."""
         self.setUp_distribution_with_bootstrap(
             Bootstrap().get_bootstrap("sdl2", self.ctx)
         )
-        mock_open.side_effect = [
-            mock.mock_open(read_data=json.dumps(dist_info_data)).return_value
-        ]
-        dist_info = self.ctx.bootstrap.distribution.get_dist_info("/fake_dir")
-        mock_open.assert_called_once_with("/fake_dir/dist_info.json", "r")
-        self.assertIsInstance(dist_info, dict)
+
+        mock_open = mock.mock_open(read_data=json.dumps(dist_info_data))
+        with mock.patch("pythonforandroid.distribution.open", mock_open):
+            dist_info = self.ctx.bootstrap.distribution.dist_info
+        mock_open.assert_called_once_with(
+            self.ctx.bootstrap.distribution.dist_info_file, "r",
+        )
+        self.assertEqual(dist_info, dist_info_data)
 
     @mock.patch("pythonforandroid.distribution.json.dump")
     @mock.patch("pythonforandroid.distribution.open", create=True)
@@ -132,24 +133,22 @@ def test_update_dist_info(self, mock_open, mock_json):
         expected_json_file = mock.mock_open(
             read_data=json.dumps(new_info_data)
         ).return_value
-        mock_open.side_effect = [
-            # first call to open, when we read the file
-            mock.mock_open(read_data=json.dumps(dist_info_data)).return_value,
-            # second call to open, when we update the file
-            expected_json_file,
-        ]
+        mock_open.side_effect = [expected_json_file]
+
+        with mock.patch(
+                'pythonforandroid.distribution.Distribution.dist_info',
+                new_callable=mock.PropertyMock,
+                return_value=dist_info_data,
+        ) as mock_dist_info:
+            self.ctx.bootstrap.distribution.update_dist_info(
+                "android_api", new_info_data['android_api']
+            )
+        # We expect two calls to property `dist_info` (read and write)
+        self.assertEqual(len(mock_dist_info.call_args), 2)
 
-        self.ctx.bootstrap.distribution.update_dist_info(
-            "android_api", new_info_data['android_api']
-        )
-        # Note: call_args only contemplates the last mocked call, see also:
-        # https://docs.python.org/3/library/unittest.mock.html#unittest.mock.Mock.call_args   # noqa
-        self.assertTrue(mock_open.call_args[0][0].endswith(
-            'dists/test_prj__armeabi-v7a/dist_info.json')
-        )
-        self.assertEqual(mock_open.call_args[0][1], 'w')
-        mock_json.assert_called_once_with(
-            new_info_data, expected_json_file, indent=4, sort_keys=True,
+        mock_open.assert_called_once_with(
+            self.ctx.bootstrap.distribution.dist_info_file,
+            "w",
         )
 
     @mock.patch("pythonforandroid.distribution.open", create=True)
@@ -197,16 +196,22 @@ def test_update_dist_android_api(self, mock_open):
         ]
 
         dist = self.ctx.bootstrap.distribution
-        dist.update_dist_android_api(new_android_api)
+        with mock.patch(
+                'pythonforandroid.distribution.Distribution.dist_info',
+                new_callable=mock.PropertyMock,
+                return_value=dist_info_data,
+        ) as mock_dist_info:
+            dist.update_dist_android_api(new_android_api)
+        # We expect two calls to property `dist_info` (read and write)
+        self.assertEqual(len(mock_dist_info.call_args), 2)
+
         mock_open.assert_has_calls(
             [
                 mock.call(os.path.join(dist.dist_dir, "build.gradle"), "r"),
                 mock.call(os.path.join(dist.dist_dir, "build.gradle"), "w"),
                 mock.call(
                     os.path.join(dist.dist_dir, "project.properties"), "w"
                 ),
-                mock.call(os.path.join(dist.dist_dir, "dist_info.json"), "r"),
-                mock.call(os.path.join(dist.dist_dir, "dist_info.json"), "w"),
             ]
         )