diff options
Diffstat (limited to 'ipsilon/util')
| -rw-r--r-- | ipsilon/util/config.py | 18 | ||||
| -rw-r--r-- | ipsilon/util/data.py | 1 | ||||
| -rw-r--r-- | ipsilon/util/endpoint.py | 1 | ||||
| -rw-r--r-- | ipsilon/util/errors.py | 1 | ||||
| -rw-r--r-- | ipsilon/util/page.py | 2 | ||||
| -rw-r--r-- | ipsilon/util/user.py | 2 |
6 files changed, 10 insertions, 15 deletions
diff --git a/ipsilon/util/config.py b/ipsilon/util/config.py index 5366a96..a20c87c 100644 --- a/ipsilon/util/config.py +++ b/ipsilon/util/config.py @@ -109,7 +109,7 @@ class Option(Log): return None def _str_import_value(self, value): - if type(value) is not str: + if not isinstance(value, str): raise ValueError('Value must be string') self._assigned_value = value @@ -170,7 +170,7 @@ class List(Option): return None def import_value(self, value): - if type(value) is not str: + if not isinstance(value, str): raise ValueError('Value (type: %s) must be string' % type(value)) self._assigned_value = [x.strip() for x in value.split(',')] @@ -180,7 +180,7 @@ class ComplexList(List): def _check_value(self, value): if value is None: return - if type(value) is not list: + if not isinstance(value, list): raise ValueError('The value type must be a list, not "%s"' % type(value)) @@ -194,7 +194,7 @@ class ComplexList(List): return None def import_value(self, value): - if type(value) is not str: + if not isinstance(value, str): raise ValueError('The value type must be a string, not "%s"' % type(value)) jsonval = json.loads(value) @@ -206,11 +206,11 @@ class MappingList(ComplexList): def _check_value(self, value): if value is None: return - if type(value) is not list: + if not isinstance(value, list): raise ValueError('The value type must be a list, not "%s"' % type(value)) for v in value: - if type(v) is not list: + if not isinstance(v, list): raise ValueError('Each element must be a list, not "%s"' % type(v)) if len(v) != 2: @@ -218,7 +218,7 @@ class MappingList(ComplexList): ' not %d' % len(v)) def import_value(self, value): - if type(value) is not str: + if not isinstance(value, str): raise ValueError('Value (type: %s) must be string' % type(value)) jsonval = json.loads(value) self.set_value(jsonval) @@ -253,7 +253,7 @@ class Choice(Option): return '%s=%s' % (self.name, self.get_value()) def set_value(self, value): - if type(value) is not list: + if not isinstance(value, list): value = [value] self._assigned_value = list() for val in value: @@ -267,7 +267,7 @@ class Choice(Option): self._assigned_value = None def unset_value(self, value): - if type(value) is str: + if isinstance(value, str): value = [value] unset = list() for val in value: diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py index 0d1c2df..eec00b5 100644 --- a/ipsilon/util/data.py +++ b/ipsilon/util/data.py @@ -58,7 +58,6 @@ class SqlStore(Log): # It's not possible to share connections for SQLite between # threads, so let's use the SingletonThreadPool for them pool_args = {'poolclass': SingletonThreadPool} - # pylint: disable=star-args self._dbengine = create_engine(engine_name, **pool_args) self.is_readonly = False diff --git a/ipsilon/util/endpoint.py b/ipsilon/util/endpoint.py index 20d3694..92dc388 100644 --- a/ipsilon/util/endpoint.py +++ b/ipsilon/util/endpoint.py @@ -62,7 +62,6 @@ class Endpoint(Log): return False def __call__(self, *args, **kwargs): - # pylint: disable=star-args cherrypy.response.headers.update(self.default_headers) self.user = UserSession().get_user() diff --git a/ipsilon/util/errors.py b/ipsilon/util/errors.py index 7017a1b..70d2da9 100644 --- a/ipsilon/util/errors.py +++ b/ipsilon/util/errors.py @@ -24,7 +24,6 @@ class Errors(Page): super(Errors, self).__init__(*args, **kwargs) def _error_template(self, *args, **kwargs): - # pylint: disable=star-args output_page = self._template(*args, **kwargs) # for some reason cherrypy will choke if the output # is a unicode object, so use str() here to please it diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py index ec3828d..094a6a9 100644 --- a/ipsilon/util/page.py +++ b/ipsilon/util/page.py @@ -71,7 +71,6 @@ class Page(Endpoint): return False def __call__(self, *args, **kwargs): - # pylint: disable=star-args cherrypy.response.headers.update(self.default_headers) self.user = UserSession().get_user() @@ -116,7 +115,6 @@ class Page(Endpoint): return model def _template(self, *args, **kwargs): - # pylint: disable=star-args t = self._site['template_env'].get_template(args[0]) m = self._template_model() m.update(kwargs) diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py index 38449cc..dd4a0f4 100644 --- a/ipsilon/util/user.py +++ b/ipsilon/util/user.py @@ -140,7 +140,7 @@ class UserSession(Log): def logout(self, user): if user is not None: - if not type(user) is User: + if not isinstance(user, User): raise TypeError # Completely reset user data cherrypy.log.error('%s %s' % (user.name, user.fullname), |