Skip to content

Commit

Permalink
Use pragma: no cover everywhere.
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Apr 29, 2016
1 parent 7f15640 commit e74d867
Show file tree
Hide file tree
Showing 28 changed files with 90 additions and 90 deletions.
16 changes: 8 additions & 8 deletions c2cgeoportal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _render(value, system):

def add_interface(
config, interface_name=None, interface_type=INTERFACE_TYPE_CGXP, **kwargs
): # pragma: nocover
): # pragma: no cover
if interface_type == INTERFACE_TYPE_CGXP:
if interface_name is None:
add_interface_cgxp(
Expand Down Expand Up @@ -128,7 +128,7 @@ def add_interface(
)


def add_interface_cgxp(config, interface_name, route_names, routes, renderers): # pragma: nocover
def add_interface_cgxp(config, interface_name, route_names, routes, renderers): # pragma: no cover
# Cannot be at the header to don"t load the model too early
from c2cgeoportal.views.entry import Entry

Expand Down Expand Up @@ -175,7 +175,7 @@ def new_f(root, request):
ngeo_static_init = False


def add_interface_ngeo(config, interface_name, route_name, route, renderer): # pragma: nocover
def add_interface_ngeo(config, interface_name, route_name, route, renderer): # pragma: no cover
# Cannot be at the header to don't load the model too early
from c2cgeoportal.views.entry import Entry

Expand Down Expand Up @@ -213,7 +213,7 @@ def new_f(root, request):
ngeo_static_init = True


def add_static_view_ngeo(config): # pragma: nocover
def add_static_view_ngeo(config): # pragma: no cover
""" Add the project static view for ngeo """
package = config.get_settings()["package"]
_add_static_view(config, "static-ngeo", "%s:static-ngeo" % package)
Expand Down Expand Up @@ -385,7 +385,7 @@ def __call__(self, context, request):
return False
return True

def phash(self): # pragma: nocover
def phash(self): # pragma: no cover
return ""


Expand Down Expand Up @@ -414,7 +414,7 @@ def add_cors_route(config, pattern, service):
"""
Add the OPTIONS route and view need for services supporting CORS.
"""
def view(request): # pragma: nocover
def view(request): # pragma: no cover
from c2cgeoportal.lib.caching import set_common_headers, NO_CACHE
return set_common_headers(request, service, NO_CACHE)

Expand All @@ -423,7 +423,7 @@ def view(request): # pragma: nocover
config.add_view(view, route_name=name)


def error_handler(http_exception, request): # pragma: nocover
def error_handler(http_exception, request): # pragma: no cover
"""
View callable for handling all the exceptions that are not already handled.
"""
Expand Down Expand Up @@ -510,7 +510,7 @@ def includeme(config):
config.add_directive("set_user_validator", set_user_validator)
config.set_user_validator(default_user_validator)

if settings.get("ogcproxy_enable", False): # pragma: nocover
if settings.get("ogcproxy_enable", False): # pragma: no cover
# add an OGCProxy view
config.add_route_predicate("ogc_server", OgcproxyRoutePredicate)
config.add_route(
Expand Down
4 changes: 2 additions & 2 deletions c2cgeoportal/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ def render_tree(self):


# LayerWMTS
class RoListRenderer(FieldRenderer): # pragma: nocover
class RoListRenderer(FieldRenderer): # pragma: no cover
def render_readonly(self, **kwargs):
return helpers.content_tag("span", ("," + helpers.tag("br")).join([
helpers.literal(value) for value in self.raw_value
Expand All @@ -491,7 +491,7 @@ class ChildrenAttributeField(AttributeField):
def __init__(self, *args, **kargs):
AttributeField.__init__(self, *args, **kargs)

def sync(self): # pragma: nocover
def sync(self): # pragma: no cover
self.model.children = [
self.parent.session.query(models.TreeItem).get(int(pk))
for pk in self.renderer.deserialize()
Expand Down
2 changes: 1 addition & 1 deletion c2cgeoportal/lib/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def create_authentication(settings):
return MultiAuthenticationPolicy(policies)


def c2cgeoportal_check(username, password, request): # pragma: nocover
def c2cgeoportal_check(username, password, request): # pragma: no cover
if request.registry.validate_user(request, username, password):
return []
return None
2 changes: 1 addition & 1 deletion c2cgeoportal/lib/bashcolor.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@
WHITE = 7


def colorize(text, color): # pragma: nocover
def colorize(text, color): # pragma: no cover
return "\x1b[01;3%im%s\x1b[0m" % (color, text)
2 changes: 1 addition & 1 deletion c2cgeoportal/lib/cacheversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def get_cache_version():
return uuid.uuid4().hex


def version_cache_buster(request, subpath, kw): # pragma: nocover
def version_cache_buster(request, subpath, kw): # pragma: no cover
return urljoin(get_cache_version() + "/", subpath), kw


Expand Down
8 changes: 4 additions & 4 deletions c2cgeoportal/lib/caching.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ def keygen_function(namespace, fn):

if namespace is None:
namespace = "%s:%s" % (fn.__module__, fn.__name__)
else: # pragma: nocover
else: # pragma: no cover
namespace = "%s:%s|%s" % (fn.__module__, fn.__name__, namespace)

args = inspect.getargspec(fn)
has_self = args[0] and args[0][0] in ("self", "cls")

def generate_key(*args, **kw):
if kw: # pragma: nocover
if kw: # pragma: no cover
raise ValueError(
"key creation function does not accept keyword arguments.")
parts = [namespace]
Expand Down Expand Up @@ -89,7 +89,7 @@ def get_region(region=None):
"""
try:
return _regions[region]
except KeyError: # pragma: nocover
except KeyError: # pragma: no cover
raise Exception(
"No such caching region. A region must be"
"initialized before it can be used")
Expand Down Expand Up @@ -174,7 +174,7 @@ def set_common_headers(
response.cache_control.private = True
else:
response.cache_control.public = True
else: # pragma: nocover
else: # pragma: no cover
raise "Invalid cache type"

if hasattr(request, "registry"):
Expand Down
4 changes: 2 additions & 2 deletions c2cgeoportal/lib/dbreflection.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def __get__(self, obj, type=None):
# and class levels we could return an SQL expression here.
# The code of hybrid_property in SQLAlchemy illustrates
# how to do that.
raise AttributeError # pragma: nocover
raise AttributeError # pragma: no cover
target = getattr(obj, self.target)
return getattr(target, self.value_attr) if target else None

Expand Down Expand Up @@ -123,7 +123,7 @@ def _xsd_sequence_callback(tb, cls):


def _column_reflect_listener(inspector, table, column_info, engine):
if isinstance(column_info["type"], Geometry): # pragma: nocover
if isinstance(column_info["type"], Geometry): # pragma: no cover
query = engine.execute(
sql.text(SQL_GEOMETRY_COLUMNS),
table_schema=table.schema,
Expand Down
8 changes: 4 additions & 4 deletions c2cgeoportal/lib/filter_capabilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,10 @@ def endElement(self, name): # noqa
elif name == "Name":
self.in_name = False

def startElementNS(self, name, qname, attrs): # pragma: nocover # noqa
def startElementNS(self, name, qname, attrs): # pragma: no cover # noqa
self._do(lambda: self._downstream.startElementNS(name, qname, attrs))

def endElementNS(self, name, qname): # pragma: nocover # noqa
def endElementNS(self, name, qname): # pragma: no cover # noqa
self._do(lambda: self._downstream.endElementNS(name, qname))

def _keep_layer(self, layer_name):
Expand All @@ -339,10 +339,10 @@ def characters(self, text):

self._do(lambda: self._accumulator.append(text.encode("utf-8")))

def ignorableWhitespace(self, ws): # pragma: nocover # noqa
def ignorableWhitespace(self, ws): # pragma: no cover # noqa
self._do(lambda: self._accumulator.append(ws))

def processingInstruction(self, target, body): # pragma: nocover # noqa
def processingInstruction(self, target, body): # pragma: no cover # noqa
self._do(lambda: self._downstream.processingInstruction(target, body))

def skippedEntity(self, name): # pragma: no cover # noqa
Expand Down
6 changes: 3 additions & 3 deletions c2cgeoportal/lib/lingua_extractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
from c2cgeoportal.lib.bashcolor import colorize, RED


class GeoMapfishAngularExtractor(Extractor): # pragma: nocover
class GeoMapfishAngularExtractor(Extractor): # pragma: no cover
"GeoMapfish angular extractor"

extensions = [".js", ".html"]
Expand All @@ -68,7 +68,7 @@ def __call__(self, filename, options):
raise


class GeoMapfishConfigExtractor(Extractor): # pragma: nocover
class GeoMapfishConfigExtractor(Extractor): # pragma: no cover
"GeoMapfish config extractor (raster layers, and print templates)"

extensions = [".yaml"]
Expand Down Expand Up @@ -105,7 +105,7 @@ def __call__(self, filename, options):
raise Exception("Not a known config file")


class GeoMapfishThemeExtractor(Extractor): # pragma: nocover
class GeoMapfishThemeExtractor(Extractor): # pragma: no cover
"GeoMapfish theme extractor"

# Run on the development.ini file
Expand Down
2 changes: 1 addition & 1 deletion c2cgeoportal/lib/wmstparsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def _parse_default_values(default_values):
slash separated String.
return None on the seconde value if it doesn't exist.
"""
if default_values is None: # pragma: nocover
if default_values is None: # pragma: no cover
return None, None

def_value = str(default_values).split("/")
Expand Down
38 changes: 19 additions & 19 deletions c2cgeoportal/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
try:
from hashlib import sha1
sha1 # suppress pyflakes warning
except ImportError: # pragma: nocover
except ImportError: # pragma: no cover
from sha import new as sha1

import sqlahelper
Expand Down Expand Up @@ -73,23 +73,23 @@

try:
postgis_version = DBSession.execute(func.postgis_version()).scalar()
except UnboundExecutionError: # pragma: nocover - needed by non functional tests
except UnboundExecutionError: # pragma: no cover - needed by non functional tests
postgis_version = "2.0"
management = postgis_version.startswith("1.")

AUTHORIZED_ROLE = "role_admin"

if schema is not None:
_schema = schema
else: # pragma: nocover
else: # pragma: no cover
raise Exception(
"schema not specified, you need to add it to your config"
)
_parentschema = parentschema

if srid is not None:
_srid = srid
else: # pragma: nocover
else: # pragma: no cover
raise Exception(
"srid not specified, you need to add it to your config"
)
Expand All @@ -101,7 +101,7 @@ def cache_invalidate_cb(*args):

class TsVector(UserDefinedType):
""" A custom type for PostgreSQL's tsvector type. """
def get_col_spec(self): # pragma: nocover
def get_col_spec(self): # pragma: no cover
return "TSVECTOR"


Expand Down Expand Up @@ -149,7 +149,7 @@ def __init__(self, name=u"", value=u"", description=u""):
self.description = description

def __unicode__(self):
return "%s - %s" % (self.name or u"", self.value or u"") # pragma: nocover
return "%s - %s" % (self.name or u"", self.value or u"") # pragma: no cover

event.listen(Functionality, "after_update", cache_invalidate_cb)
event.listen(Functionality, "after_delete", cache_invalidate_cb)
Expand Down Expand Up @@ -301,7 +301,7 @@ def validate_password(self, passwd):
password = property(_get_password, _set_password)

def __unicode__(self):
return self.username or u"" # pragma: nocover
return self.username or u"" # pragma: no cover


class Role(Base):
Expand Down Expand Up @@ -331,7 +331,7 @@ def __init__(self, name=u"", description=u"", functionalities=[], extent=None):
self.description = description

def __unicode__(self):
return self.name or u"" # pragma: nocover
return self.name or u"" # pragma: no cover

@property
def bounds(self):
Expand All @@ -357,11 +357,11 @@ class TreeItem(Base):
description = Column(Unicode, label=_(u"Description"))

@property
def parents(self): # pragma: nocover
def parents(self): # pragma: no cover
return [c.group for c in self.parents_relation]

def is_in_interface(self, name):
if not hasattr(self, "interfaces"): # pragma: nocover
if not hasattr(self, "interfaces"): # pragma: no cover
return False

for interface in self.interfaces:
Expand All @@ -370,14 +370,14 @@ def is_in_interface(self, name):

return False

def get_metadatas(self, name): # pragma: nocover
def get_metadatas(self, name): # pragma: no cover
return [metadata for metadata in self.ui_metadatas if metadata.name == name]

def __init__(self, name=u""):
self.name = name

def __unicode__(self):
return self.name or u"" # pragma: nocover
return self.name or u"" # pragma: no cover

event.listen(TreeItem, "after_insert", cache_invalidate_cb, propagate=True)
event.listen(TreeItem, "after_update", cache_invalidate_cb, propagate=True)
Expand Down Expand Up @@ -422,7 +422,7 @@ class LayergroupTreeitem(Base):
ordering = Column(Integer)

# Used by formalchemy
def __unicode__(self): # pragma: nocover
def __unicode__(self): # pragma: no cover
return self.group.name

def __init__(self, group=None, item=None, ordering=0):
Expand Down Expand Up @@ -673,7 +673,7 @@ def __init__(self, name="", description=None, url=None, url_wfs=None, type=u"map
self.is_single_tile = is_single_tile

def __unicode__(self):
return self.name or u"" # pragma: nocover
return self.name or u"" # pragma: no cover


class LayerWMS(Layer):
Expand Down Expand Up @@ -806,7 +806,7 @@ def __init__(self, name="", description="", layers=[], roles=[],
self.area = area
self.readwrite = readwrite

def __unicode__(self): # pragma: nocover
def __unicode__(self): # pragma: no cover
return self.name or u""

event.listen(RestrictionArea, "after_insert", cache_invalidate_cb)
Expand Down Expand Up @@ -870,7 +870,7 @@ def __init__(self, name="", description=""):
self.name = name
self.description = description

def __unicode__(self): # pragma: nocover
def __unicode__(self): # pragma: no cover
return self.name or u""


Expand Down Expand Up @@ -904,7 +904,7 @@ def __init__(self, name="", value=""):
self.name = name
self.value = value

def __unicode__(self): # pragma: nocover
def __unicode__(self): # pragma: no cover
return u"%s: %s" % (self.name or u"", self.value or u"")


Expand Down Expand Up @@ -939,7 +939,7 @@ def __init__(self, name="", value="", layer=None):
self.value = value
self.layer = layer

def __unicode__(self): # pragma: nocover
def __unicode__(self): # pragma: no cover
return self.name or u""


Expand All @@ -960,7 +960,7 @@ def __init__(self, name=u""):
self.name = name

def __unicode__(self):
return self.name or u"" # pragma: nocover
return self.name or u"" # pragma: no cover


class Shorturl(Base):
Expand Down
Loading

0 comments on commit e74d867

Please sign in to comment.