kallithea Changeset - 7aa0ff5b4e09

Changeset - 7aa0ff5b4e09

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 12 years ago 2013-05-22 03:14:03
marcin@python-works.com

simplified boolean expressions

4 files changed with 6 insertions and 6 deletions:

rhodecode/lib/celerypylons/commands.py

rhodecode/lib/dbmigrate/migrate/versioning/version.py

rhodecode/lib/utils.py

rhodecode/model/permission.py

0 comments (0 inline, 0 general)

rhodecode/lib/celerypylons/commands.py

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ class CeleryCommand(BasePasterCommand): @@
         from pylons import config
         try:
             CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
         except KeyError:
             CELERY_ON = False
-        if CELERY_ON == False:
+        if not CELERY_ON:
             raise Exception('Please enable celery_on in .ini config '
                             'file before running celeryd')
         rhodecode.CELERY_ON = CELERY_ON
         load_rcextensions(config['here'])
         cmd = self.celery_command(app_or_default())
         return cmd.run(**vars(self.options))

rhodecode/lib/dbmigrate/migrate/versioning/version.py

➞

Show inline comments

@@ @@ -87,13 +87,13 @@ class Collection(pathed.Pathed): @@
     @property
     def latest(self):
         """:returns: Latest version in Collection"""
         return max([VerNum(0)] + self.versions.keys())
     def _next_ver_num(self, use_timestamp_numbering):
-        if use_timestamp_numbering == True:
         if use_timestamp_numbering:
             return VerNum(int(datetime.utcnow().strftime('%Y%m%d%H%M%S')))
         else:
             return self.latest + 1
     def create_new_python_version(self, description, **k):
         """Create Python files for new version"""

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -552,13 +552,13 @@ def load_rcextensions(root_path): @@
         # Additional mappings that are not present in the pygments lexers
         conf.LANGUAGES_EXTENSIONS_MAP.update(getattr(EXT, 'EXTRA_MAPPINGS', {}))
         #OVERRIDE OUR EXTENSIONS FROM RC-EXTENSIONS (if present)
-        if getattr(EXT, 'INDEX_EXTENSIONS', []) != []:
         if getattr(EXT, 'INDEX_EXTENSIONS', []):
             log.debug('settings custom INDEX_EXTENSIONS')
             conf.INDEX_EXTENSIONS = getattr(EXT, 'INDEX_EXTENSIONS', [])
         #ADDITIONAL MAPPINGS
         log.debug('adding extra into INDEX_EXTENSIONS')
         conf.INDEX_EXTENSIONS.extend(getattr(EXT, 'EXTRA_INDEX_EXTENSIONS', []))

rhodecode/model/permission.py

➞

Show inline comments

@@ @@ -120,36 +120,36 @@ class PermissionModel(BaseModel): @@
                                  'default_fork', 'default_register',
                                  'default_extern_activate']:
                 p = _make_new(perm_user, form_result[def_perm_key])
                 self.sa.add(p)
             #stage 3 update all default permissions for repos if checked
-            if form_result['overwrite_default_repo'] == True:
             if form_result['overwrite_default_repo']:
                 _def_name = form_result['default_repo_perm'].split('repository.')[-1]
                 _def = Permission.get_by_key('repository.' + _def_name)
                 # repos
                 for r2p in self.sa.query(UserRepoToPerm)\
                                .filter(UserRepoToPerm.user == perm_user)\
                                .all():
                     #don't reset PRIVATE repositories
                     if not r2p.repository.private:
                         r2p.permission = _def
                         self.sa.add(r2p)
-            if form_result['overwrite_default_group'] == True:
             if form_result['overwrite_default_group']:
                 _def_name = form_result['default_group_perm'].split('group.')[-1]
                 # groups
                 _def = Permission.get_by_key('group.' + _def_name)
                 for g2p in self.sa.query(UserRepoGroupToPerm)\
                                .filter(UserRepoGroupToPerm.user == perm_user)\
                                .all():
                     g2p.permission = _def
                     self.sa.add(g2p)
-            if form_result['overwrite_default_user_group'] == True:
             if form_result['overwrite_default_user_group']:
                 _def_name = form_result['default_user_group_perm'].split('usergroup.')[-1]
                 # groups
                 _def = Permission.get_by_key('usergroup.' + _def_name)
                 for g2p in self.sa.query(UserUserGroupToPerm)\
                                .filter(UserUserGroupToPerm.user == perm_user)\
                                .all():

0 comments (0 inline, 0 general)