← Back to team overview

launchpad-reviewers team mailing list archive

  1. launchpad-reviewers team
  2. Mailing list archive
  3. Message #27778

[Merge] ~cjwatson/launchpad:remove-pep-263-codings into launchpad:master

  Thread Previous • Date Previous • • Thread Next 
Colin Watson has proposed merging ~cjwatson/launchpad:remove-pep-263-codings into launchpad:master.

Commit message:
Remove "coding: utf-8" comments

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/412452

https://www.python.org/dev/peps/pep-0263/ introduced header comments to indicate different source code encodings.  https://www.python.org/dev/peps/pep-3120/ changed the default source encoding to UTF-8, so these are no longer necessary.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:remove-pep-263-codings into launchpad:master.

diff --git a/doc/conf.py b/doc/conf.py
index 0d88609..5233f37 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Launchpad documentation build configuration file, created by
 # sphinx-quickstart on Thu Feb  3 16:06:09 2011.
 #
diff --git a/lib/lp/archivepublisher/tests/test_sync_signingkeys.py b/lib/lp/archivepublisher/tests/test_sync_signingkeys.py
index 9dbc55a..f99a0ae 100644
--- a/lib/lp/archivepublisher/tests/test_sync_signingkeys.py
+++ b/lib/lp/archivepublisher/tests/test_sync_signingkeys.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/archiveuploader/tests/test_ppauploadprocessor.py b/lib/lp/archiveuploader/tests/test_ppauploadprocessor.py
index e8d1c54..2ae52d7 100644
--- a/lib/lp/archiveuploader/tests/test_ppauploadprocessor.py
+++ b/lib/lp/archiveuploader/tests/test_ppauploadprocessor.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2009-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/buildmaster/tests/test_manager.py b/lib/lp/buildmaster/tests/test_manager.py
index cd02bce..8a7fd2d 100644
--- a/lib/lp/buildmaster/tests/test_manager.py
+++ b/lib/lp/buildmaster/tests/test_manager.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/code/browser/tests/test_branchmergeproposal.py b/lib/lp/code/browser/tests/test_branchmergeproposal.py
index 519ec9a..e722def 100644
--- a/lib/lp/code/browser/tests/test_branchmergeproposal.py
+++ b/lib/lp/code/browser/tests/test_branchmergeproposal.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/code/model/tests/test_githosting.py b/lib/lp/code/model/tests/test_githosting.py
index b1a52b7..3ca4fdc 100644
--- a/lib/lp/code/model/tests/test_githosting.py
+++ b/lib/lp/code/model/tests/test_githosting.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2016-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/code/model/tests/test_gitrepository.py b/lib/lp/code/model/tests/test_gitrepository.py
index 548cb62..252b535 100644
--- a/lib/lp/code/model/tests/test_gitrepository.py
+++ b/lib/lp/code/model/tests/test_gitrepository.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2015-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/oci/browser/tests/test_ocirecipe.py b/lib/lp/oci/browser/tests/test_ocirecipe.py
index dab70d4..0479b15 100644
--- a/lib/lp/oci/browser/tests/test_ocirecipe.py
+++ b/lib/lp/oci/browser/tests/test_ocirecipe.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2020-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/registry/browser/tests/test_distribution.py b/lib/lp/registry/browser/tests/test_distribution.py
index 58c3fed..f75dce0 100644
--- a/lib/lp/registry/browser/tests/test_distribution.py
+++ b/lib/lp/registry/browser/tests/test_distribution.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2011-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/registry/browser/tests/test_ociproject.py b/lib/lp/registry/browser/tests/test_ociproject.py
index f9230aa..4557d1d 100644
--- a/lib/lp/registry/browser/tests/test_ociproject.py
+++ b/lib/lp/registry/browser/tests/test_ociproject.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2019-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/registry/browser/tests/test_person.py b/lib/lp/registry/browser/tests/test_person.py
index 33d8f9b..bed2125 100644
--- a/lib/lp/registry/browser/tests/test_person.py
+++ b/lib/lp/registry/browser/tests/test_person.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/registry/tests/test_prf_log.py b/lib/lp/registry/tests/test_prf_log.py
index 2d663a0..b5596ed 100644
--- a/lib/lp/registry/tests/test_prf_log.py
+++ b/lib/lp/registry/tests/test_prf_log.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/services/encoding.py b/lib/lp/services/encoding.py
index 678df8d..f3796bd 100644
--- a/lib/lp/services/encoding.py
+++ b/lib/lp/services/encoding.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2009-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/snappy/browser/tests/test_snap.py b/lib/lp/snappy/browser/tests/test_snap.py
index b1a55d4..3e54942 100644
--- a/lib/lp/snappy/browser/tests/test_snap.py
+++ b/lib/lp/snappy/browser/tests/test_snap.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2015-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/soyuz/mail/tests/test_packageupload.py b/lib/lp/soyuz/mail/tests/test_packageupload.py
index 1b59fd5..2dc2a7a 100644
--- a/lib/lp/soyuz/mail/tests/test_packageupload.py
+++ b/lib/lp/soyuz/mail/tests/test_packageupload.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2011-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/soyuz/scripts/tests/test_gina.py b/lib/lp/soyuz/scripts/tests/test_gina.py
index f563c10..69720b1 100644
--- a/lib/lp/soyuz/scripts/tests/test_gina.py
+++ b/lib/lp/soyuz/scripts/tests/test_gina.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/soyuz/tests/test_sourcepackagerelease.py b/lib/lp/soyuz/tests/test_sourcepackagerelease.py
index f80912c..5e3c20a 100644
--- a/lib/lp/soyuz/tests/test_sourcepackagerelease.py
+++ b/lib/lp/soyuz/tests/test_sourcepackagerelease.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2010-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/testing/factory.py b/lib/lp/testing/factory.py
index 8838ae7..9d59ba8 100644
--- a/lib/lp/testing/factory.py
+++ b/lib/lp/testing/factory.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
diff --git a/lib/lp/translations/utilities/tests/test_xpi_po_exporter.py b/lib/lp/translations/utilities/tests/test_xpi_po_exporter.py
index 438b23b..4158c8e 100644
--- a/lib/lp/translations/utilities/tests/test_xpi_po_exporter.py
+++ b/lib/lp/translations/utilities/tests/test_xpi_po_exporter.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# NOTE: The first line above must stay first; do not move the copyright
-# notice to the top.  See http://www.python.org/dev/peps/pep-0263/.
-#
 # Copyright 2009-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).

Follow ups

  Thread Previous • Date Previous • • Thread Next