Merge pull request #2015 from Andrej730/main

Use property decorator to support typing

Author: Byron

git/refs/symbolic.py

@@ -39,7 +39,6 @@
 ifTYPE_CHECKING:
 fromgit.configimportGitConfigParser
 fromgit.objects.commitimportActor
-fromgit.refsimportHead, TagReference, RemoteReference, Reference
 fromgit.refs.logimportRefLogEntry
 fromgit.repoimportRepo
 
@@ -387,17 +386,23 @@ def set_object(
 # set the commit on our reference
 returnself._get_reference().set_object(object, logmsg)
 
-commit=property(
-_get_commit,
-set_commit, # type: ignore[arg-type]
-doc="Query or set commits directly",
- )
+@property
+defcommit(self) ->"Commit":
+"""Query or set commits directly"""
+returnself._get_commit()
+
+@commit.setter
+defcommit(self, commit: Union[Commit, "SymbolicReference", str]) ->"SymbolicReference":
+returnself.set_commit(commit)
+
+@property
+defobject(self) ->AnyGitObject:
+"""Return the object our ref currently refers to"""
+returnself._get_object()
 
-object=property(
-_get_object,
-set_object, # type: ignore[arg-type]
-doc="Return the object our ref currently refers to",
- )
+@object.setter
+defobject(self, object: Union[AnyGitObject, "SymbolicReference", str]) ->"SymbolicReference":
+returnself.set_object(object)
 
 def_get_reference(self) ->"SymbolicReference":
 """
@@ -496,12 +501,14 @@ def set_reference(
 returnself
 
 # Aliased reference
-reference: Union["Head", "TagReference", "RemoteReference", "Reference"]
-reference=property( # type: ignore[assignment]
-_get_reference,
-set_reference, # type: ignore[arg-type]
-doc="Returns the Reference we point to",
- )
+@property
+defreference(self) ->"SymbolicReference":
+returnself._get_reference()
+
+@reference.setter
+defreference(self, ref: Union[AnyGitObject, "SymbolicReference", str]) ->"SymbolicReference":
+returnself.set_reference(ref)
+
 ref=reference
 
 defis_valid(self) ->bool:

git/repo/base.py

@@ -354,21 +354,19 @@ def __ne__(self, rhs: object) -> bool:
 def__hash__(self) ->int:
 returnhash(self.git_dir)
 
-# Description property
-def_get_description(self) ->str:
+@property
+defdescription(self) ->str:
+"""The project's description"""
 filename=osp.join(self.git_dir, "description")
 withopen(filename, "rb") asfp:
 returnfp.read().rstrip().decode(defenc)
 
-def_set_description(self, descr: str) ->None:
+@description.setter
+defdescription(self, descr: str) ->None:
 filename=osp.join(self.git_dir, "description")
 withopen(filename, "wb") asfp:
 fp.write((descr+"\n").encode(defenc))
 
-description=property(_get_description, _set_description, doc="the project's description")
-del_get_description
-del_set_description
-
 @property
 defworking_tree_dir(self) ->Optional[PathLike]:
 """
@@ -885,13 +883,14 @@ def _set_daemon_export(self, value: object) -> None:
 elifnotvalueandfileexists:
 os.unlink(filename)
 
-daemon_export=property(
-_get_daemon_export,
-_set_daemon_export,
-doc="If True, git-daemon may export this repository",
- )
-del_get_daemon_export
-del_set_daemon_export
+@property
+defdaemon_export(self) ->bool:
+"""If True, git-daemon may export this repository"""
+returnself._get_daemon_export()
+
+@daemon_export.setter
+defdaemon_export(self, value: object) ->None:
+self._set_daemon_export(value)
 
 def_get_alternates(self) ->List[str]:
 """The list of alternates for this repo from which objects can be retrieved.
@@ -929,11 +928,14 @@ def _set_alternates(self, alts: List[str]) -> None:
 withopen(alternates_path, "wb") asf:
 f.write("\n".join(alts).encode(defenc))
 
-alternates=property(
-_get_alternates,
-_set_alternates,
-doc="Retrieve a list of alternates paths or set a list paths to be used as alternates",
- )
+@property
+defalternates(self) ->List[str]:
+"""Retrieve a list of alternates paths or set a list paths to be used as alternates"""
+returnself._get_alternates()
+
+@alternates.setter
+defalternates(self, alts: List[str]) ->None:
+self._set_alternates(alts)
 
 defis_dirty(
 self,