upstream/kallithea Commit - r4919:494b04a8

model: trivial typo fixes

Thomas De Schampheleire -

r4919:494b04a8 default

parent child

kallithea/model/changeset_status.py

0 +1 -1

             kallithea.model.changeset_status
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Changeset status conttroller
+            Changeset status controller
             This file was forked by the Kallithea project in July 2014.
             Original author and date, and relevant copyright and licensing information is below:

kallithea/model/db.py

0 +4 -4

             class BaseModel(object):
                 """
-                Base Model for all classess
+                Base Model for all classes
                 """
                 @classmethod
                     return d
                 def get_appstruct(self):
-                    """return list with keys and values tupples corresponding
+                    """return list with keys and values tuples corresponding
                     to this model data """
                     l = []
                 def normalize_repo_name(cls, repo_name):
                     """
                     Normalizes os specific repo_name to the format internally stored inside
-                    dabatabase using URL_SEP
+                    database using URL_SEP
                     :param cls:
                     :param repo_name:
                         if gr is None:
                             break
                         if cnt == parents_recursion_limit:
-                            # this will prevent accidental infinit loops
+                            # this will prevent accidental infinite loops
                             log.error(('more than %s parents found for group %s, stopping '
                                        'recursive parent fetching' % (parents_recursion_limit, self)))
                             break

kallithea/model/forms.py

0 +2 -2

             # You should have received a copy of the GNU General Public License
             # along with this program.  If not, see <http://www.gnu.org/licenses/>.
             """
-            this is forms validation classes
+            these are form validation classes
             http://formencode.org/module-formencode.validators.html
-            for list off all availible validators
+            for list of all available validators
             we can create our own validators

kallithea/model/scm.py

0 +13 -13

                     :param repo: SCM repo
                     :param username: username who pushes
-                    :param action: push/push_loca/push_remote
+                    :param action: push/push_local/push_remote
                     :param repo_name: name of repo
                     :param revisions: list of revisions that we pushed
                     """
                     """
                     Commits specified nodes to repo.
-                    :param user: Kallithea User object or user_id, the commiter
+                    :param user: Kallithea User object or user_id, the committer
                     :param repo: Kallithea Repository object
                     :param message: commit message
                     :param nodes: mapping {filename:{'content':content},...}
                     :param parent_cs: parent changeset, can be empty than it's initial commit
-                    :param author: author of commit, cna be different that commiter only for git
+                    :param author: author of commit, cna be different that committer only for git
                     :param trigger_push_hook: trigger push hooks
-                    :returns: new commited changeset
+                    :returns: new committed changeset
                     """
                     user = self._get_user(user)
                         processed_nodes.append((f_path, content))
                     message = safe_unicode(message)
-                    commiter = user.full_contact
+                    committer = user.full_contact
-                    author = safe_unicode(author) if author else commiter
+                    author = safe_unicode(author) if author else committer
                     IMC = self._get_IMC_module(scm_instance.alias)
                     imc = IMC(scm_instance)
                     scm_instance = repo.scm_instance_no_cache()
                     message = safe_unicode(message)
-                    commiter = user.full_contact
+                    committer = user.full_contact
-                    author = safe_unicode(author) if author else commiter
+                    author = safe_unicode(author) if author else committer
                     imc_class = self._get_IMC_module(scm_instance.alias)
                     imc = imc_class(scm_instance)
                     """
                     Deletes specified nodes from repo.
-                    :param user: Kallithea User object or user_id, the commiter
+                    :param user: Kallithea User object or user_id, the committer
                     :param repo: Kallithea Repository object
                     :param message: commit message
                     :param nodes: mapping {filename:{'content':content},...}
                     :param parent_cs: parent changeset, can be empty than it's initial commit
-                    :param author: author of commit, cna be different that commiter only for git
+                    :param author: author of commit, cna be different that committer only for git
                     :param trigger_push_hook: trigger push hooks
-                    :returns: new commited changeset after deletion
+                    :returns: new committed changeset after deletion
                     """
                     user = self._get_user(user)
                         processed_nodes.append((f_path, content))
                     message = safe_unicode(message)
-                    commiter = user.full_contact
+                    committer = user.full_contact
-                    author = safe_unicode(author) if author else commiter
+                    author = safe_unicode(author) if author else committer
                     IMC = self._get_IMC_module(scm_instance.alias)
                     imc = IMC(scm_instance)

kallithea/model/user.py

0 +1 -1

                     """
                     Fetches auth_user by user_id,or api_key if present.
                     Fills auth_user attributes with those taken from database.
-                    Additionally sets is_authenitated if lookup fails
+                    Additionally sets is_authenticated if lookup fails
                     present in database
                     :param auth_user: instance of user to set attributes

kallithea/model/validators.py

0 +1 -1

                                 if member == User.DEFAULT_USER:
                                     if str2bool(value.get('repo_private')):
                                         # set none for default when updating to
-                                        # private repo protects agains form manipulation
+                                        # private repo protects against form manipulation
                                         v = EMPTY_PERM
                                 perms_update.add((member, v, t))

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages