diff --git a/cloudkittydashboard/api/cloudkitty.py b/cloudkittydashboard/api/cloudkitty.py index a980f9a..ef99873 100644 --- a/cloudkittydashboard/api/cloudkitty.py +++ b/cloudkittydashboard/api/cloudkitty.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Objectif Libre # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/cloudkittydashboard/dashboards/admin/hashmap/tables.py b/cloudkittydashboard/dashboards/admin/hashmap/tables.py index 84805de..0be6a6a 100644 --- a/cloudkittydashboard/dashboards/admin/hashmap/tables.py +++ b/cloudkittydashboard/dashboards/admin/hashmap/tables.py @@ -41,16 +41,16 @@ class DeleteService(tables.DeleteAction): @staticmethod def action_present(count): return ngettext_lazy( - u"Delete Service", - u"Delete Services", + "Delete Service", + "Delete Services", count ) @staticmethod def action_past(count): return ngettext_lazy( - u"Deleted Service", - u"Deleted Services", + "Deleted Service", + "Deleted Services", count ) @@ -103,16 +103,16 @@ class DeleteGroup(tables.DeleteAction): @staticmethod def action_present(count): return ngettext_lazy( - u"Delete Group", - u"Delete Groups", + "Delete Group", + "Delete Groups", count ) @staticmethod def action_past(count): return ngettext_lazy( - u"Deleted Group", - u"Deleted Groups", + "Deleted Group", + "Deleted Groups", count ) @@ -190,16 +190,16 @@ class DeleteServiceThreshold(tables.DeleteAction): @staticmethod def action_present(count): return ngettext_lazy( - u"Delete Service Threshold", - u"Delete Service Thresholds", + "Delete Service Threshold", + "Delete Service Thresholds", count ) @staticmethod def action_past(count): return ngettext_lazy( - u"Deleted Service Threshold", - u"Deleted Service Thresholds", + "Deleted Service Threshold", + "Deleted Service Thresholds", count ) @@ -217,16 +217,16 @@ class DeleteFieldThreshold(tables.DeleteAction): @staticmethod def action_present(count): return ngettext_lazy( - u"Delete Field Threshold", - u"Delete Field Thresholds", + "Delete Field Threshold", + "Delete Field Thresholds", count ) @staticmethod def action_past(count): return ngettext_lazy( - u"Deleted Field Threshold", - u"Deleted Field Thresholds", + "Deleted Field Threshold", + "Deleted Field Thresholds", count ) @@ -357,16 +357,16 @@ class DeleteField(tables.DeleteAction): @staticmethod def action_present(count): return ngettext_lazy( - u"Delete Field", - u"Delete Fields", + "Delete Field", + "Delete Fields", count ) @staticmethod def action_past(count): return ngettext_lazy( - u"Deleted Field", - u"Deleted Fields", + "Deleted Field", + "Deleted Fields", count ) @@ -429,16 +429,16 @@ class DeleteMapping(tables.DeleteAction): @staticmethod def action_present(count): return ngettext_lazy( - u"Delete Mapping", - u"Delete Mappings", + "Delete Mapping", + "Delete Mappings", count ) @staticmethod def action_past(count): return ngettext_lazy( - u"Deleted Mapping", - u"Deleted Mappings", + "Deleted Mapping", + "Deleted Mappings", count ) diff --git a/cloudkittydashboard/dashboards/admin/modules/tables.py b/cloudkittydashboard/dashboards/admin/modules/tables.py index ee194b3..5c9ab75 100644 --- a/cloudkittydashboard/dashboards/admin/modules/tables.py +++ b/cloudkittydashboard/dashboards/admin/modules/tables.py @@ -47,13 +47,13 @@ class ToggleEnabledModule(tables.BatchAction): def action_present(count): return ( ngettext_lazy( - u"Enable Module", - u"Enable Modules", + "Enable Module", + "Enable Modules", count ), ngettext_lazy( - u"Disable Module", - u"Disable Modules", + "Disable Module", + "Disable Modules", count ), ) @@ -62,13 +62,13 @@ class ToggleEnabledModule(tables.BatchAction): def action_past(count): return ( ngettext_lazy( - u"Enabled Module", - u"Enabled Modules", + "Enabled Module", + "Enabled Modules", count ), ngettext_lazy( - u"Disabled Module", - u"Disabled Modules", + "Disabled Module", + "Disabled Modules", count ), ) diff --git a/cloudkittydashboard/dashboards/admin/pyscripts/tables.py b/cloudkittydashboard/dashboards/admin/pyscripts/tables.py index 76a9331..bede7e3 100644 --- a/cloudkittydashboard/dashboards/admin/pyscripts/tables.py +++ b/cloudkittydashboard/dashboards/admin/pyscripts/tables.py @@ -56,16 +56,16 @@ class DeletePyScript(tables.DeleteAction): @staticmethod def action_present(count): return ngettext_lazy( - u"Delete PyScript", - u"Delete PyScripts", + "Delete PyScript", + "Delete PyScripts", count ) @staticmethod def action_past(count): return ngettext_lazy( - u"Deleted PyScript", - u"Deleted PyScripts", + "Deleted PyScript", + "Deleted PyScripts", count ) diff --git a/cloudkittydashboard/tests/base.py b/cloudkittydashboard/tests/base.py index 1c30cdb..2159808 100644 --- a/cloudkittydashboard/tests/base.py +++ b/cloudkittydashboard/tests/base.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - # Copyright 2010-2011 OpenStack Foundation # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # diff --git a/cloudkittydashboard/tests/test_cloudkittydashboard.py b/cloudkittydashboard/tests/test_cloudkittydashboard.py index 3e066ed..4a97355 100644 --- a/cloudkittydashboard/tests/test_cloudkittydashboard.py +++ b/cloudkittydashboard/tests/test_cloudkittydashboard.py @@ -1,6 +1,5 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Objectif Libre - +# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/cloudkittydashboard/utils.py b/cloudkittydashboard/utils.py index 95fd3d4..d39eac7 100644 --- a/cloudkittydashboard/utils.py +++ b/cloudkittydashboard/utils.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Objectif Libre # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/doc/source/conf.py b/doc/source/conf.py index 3285d2e..420ec14 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/doc/source/installation.rst b/doc/source/installation.rst index cde4505..1cd37c9 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -72,5 +72,5 @@ Some symbols (Such as Non-ASCII) might require to use unicode value directly. .. code-block:: python # British Pound - OPENSTACK_CLOUDKITTY_RATE_PREFIX = u'\xA3' + OPENSTACK_CLOUDKITTY_RATE_PREFIX = '\xA3' OPENSTACK_CLOUDKITTY_RATE_POSTFIX = 'GBP' diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index aef7bea..c4ecdc1 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # Cloudkitty Release Notes documentation build configuration file. # # This file is execfile()d with the current directory set to its