import hashlib
from django.db import models
-from django.utils import six
class HashField(models.CharField):
super(HashField, self).__init__(*args, **kwargs)
def construct(self, value):
- if isinstance(value, six.text_type):
+ # TODO: should this be unconditional?
+ if isinstance(value, str):
value = value.encode('utf-8')
return hashlib.sha1(value)
# SPDX-License-Identifier: GPL-2.0-or-later
import collections
+from urllib.parse import quote
from django.contrib.auth.models import User
from django.utils.html import escape
from django.utils.safestring import mark_safe
-from django.utils import six
-from django.utils.six.moves.urllib.parse import quote
from patchwork.models import Person
from patchwork.models import Series
del params[remove.param]
def sanitise(s):
- if not isinstance(s, six.string_types):
- s = six.text_type(s)
+ # TODO: should this be unconditional?
+ if not isinstance(s, str):
+ s = str(s)
return quote(s.encode('utf-8'))
return '?' + '&'.join(['%s=%s' % (sanitise(k), sanitise(v))
import sys
from django.core.management import base
-from django.utils import six
from patchwork.parser import parse_mail
from patchwork.parser import DuplicateMailError
try:
if infile:
logger.info('Parsing mail loaded by filename')
- if six.PY3:
- with open(infile, 'rb') as file_:
- mail = email.message_from_binary_file(file_)
- else:
- with open(infile) as file_:
- mail = email.message_from_file(file_)
+ with open(infile, 'rb') as file_:
+ mail = email.message_from_binary_file(file_)
else:
logger.info('Parsing mail loaded from stdin')
- if six.PY3:
- mail = email.message_from_binary_file(sys.stdin.buffer)
- else:
- mail = email.message_from_file(sys.stdin)
+ mail = email.message_from_binary_file(sys.stdin.buffer)
except AttributeError:
logger.warning("Broken email ignored")
return
from django.core.exceptions import ValidationError
from django.db import models
from django.urls import reverse
-from django.utils.encoding import python_2_unicode_compatible
from django.utils.functional import cached_property
from patchwork.fields import HashField
raise ValidationError('Invalid regular expression entered!')
-@python_2_unicode_compatible
class Person(models.Model):
# properties
verbose_name_plural = 'People'
-@python_2_unicode_compatible
class Project(models.Model):
# properties
ordering = ['linkname']
-@python_2_unicode_compatible
class DelegationRule(models.Model):
project = models.ForeignKey(Project, on_delete=models.CASCADE)
user = models.ForeignKey(
unique_together = (('path', 'project'))
-@python_2_unicode_compatible
class UserProfile(models.Model):
user = models.OneToOneField(User, unique=True, related_name='profile',
on_delete=models.CASCADE)
models.signals.post_save.connect(_user_saved_callback, sender=User)
-@python_2_unicode_compatible
class State(models.Model):
# Both of these fields should be unique
name = models.CharField(max_length=100, unique=True)
ordering = ['ordering']
-@python_2_unicode_compatible
class Tag(models.Model):
name = models.CharField(max_length=20)
pattern = models.CharField(
# Modifying a submission via admin interface changes '\n' newlines in
# message content to '\r\n'. We need to fix them to avoid problems,
# especially as git complains about malformed patches when PW runs
- # on PY2
if self.content:
+ # on PY2 TODO: is this still needed on PY3?
self.content = self.content.replace('\r\n', '\n')
-
super(EmailMixin, self).save(*args, **kwargs)
class Meta:
return fname
-@python_2_unicode_compatible
class Submission(FilenameMixin, EmailMixin, models.Model):
# parent
'msgid': self.url_msgid})
-@python_2_unicode_compatible
class Patch(Submission):
# patch metadata
]
-@python_2_unicode_compatible
class Series(FilenameMixin, models.Model):
"""A collection of patches."""
verbose_name_plural = 'Series'
-@python_2_unicode_compatible
class SeriesReference(models.Model):
"""A reference found in a series.
ordering = ['order']
-@python_2_unicode_compatible
class PatchRelation(models.Model):
def __str__(self):
return name
-@python_2_unicode_compatible
class Check(models.Model):
"""Check for a patch.
super(EmailConfirmation, self).save()
-@python_2_unicode_compatible
class EmailOptout(models.Model):
email = models.CharField(max_length=200, primary_key=True)
from django.contrib.auth.models import User
from django.db.utils import IntegrityError
from django.db import transaction
-from django.utils import six
from patchwork.models import Comment
from patchwork.models import CoverLetter
# (e.g. base64 decoding) We probably can't recover, so:
return None
- # We have some Py2/Py3 issues here.
+ # We have some issues here.
#
- # Firstly, the email parser (before we get here)
- # Python 3: headers with weird chars are email.header.Header
- # class, others as str
- # Python 2: every header is an str
+ # Firstly, in the email parser (before we get here) headers with weird
+ # chars are email.header.Header class, others as str
#
- # Secondly, the behaviour of decode_header:
- # Python 3: weird headers are labelled as unknown-8bit
- # Python 2: weird headers are not labelled differently
- #
- # Lastly, aking matters worse, in Python2, unknown-8bit doesn't
- # seem to be supported as an input to make_header, so not only do
- # we have to detect dodgy headers, we have to fix them ourselves.
+ # Secondly, the behaviour of decode_header: weird headers are labelled
+ # as unknown-8bit
#
# We solve this by catching any Unicode errors, and then manually
# handling any interesting headers.
header = make_header(value,
header_name=header_name,
continuation_ws='\t')
- except (UnicodeDecodeError, LookupError, ValueError, TypeError):
+ except (UnicodeDecodeError, LookupError, ValueError):
# - a part cannot be encoded as ascii. (UnicodeDecodeError), or
# - we don't have a codec matching the hint (LookupError)
- # - the codec has a null byte (Py3 ValueError/Py2 TypeError)
+ # - the codec has a null byte (ValueError)
# Find out which part and fix it somehow.
#
- # We get here under Py2 when there's non-7-bit chars in header,
- # or under Py2 or Py3 where decoding with the coding hint fails.
+ # We get here under where decoding with the coding hint fails.
new_value = []
- for (part, coding) in value:
+ for (part, _) in value:
# We have random bytes that aren't properly coded.
# If we had a coding hint, it failed to help.
- if six.PY3:
- # python3 - force coding to unknown-8bit
- new_value += [(part, 'unknown-8bit')]
- else:
- # python2 - no support in make_header for unknown-8bit
- # We should do unknown-8bit coding ourselves.
- # For now, we're just going to replace any dubious
- # chars with ?.
- #
- # TODO: replace it with a proper QP unknown-8bit codec.
- new_value += [(part.decode('ascii', errors='replace')
- .encode('ascii', errors='replace'),
- None)]
+
+ # python3 - force coding to unknown-8bit
+ new_value += [(part, 'unknown-8bit')]
header = make_header(new_value,
header_name=header_name,
if sane_header is None:
return None
- header_str = six.text_type(sane_header)
+ header_str = str(sane_header)
return normalise_space(header_str)
payload = part.get_payload(decode=True)
subtype = part.get_content_subtype()
- if not isinstance(payload, six.text_type):
+ if not isinstance(payload, str):
charset = part.get_content_charset()
# Check that we have a charset that we understand. Otherwise,
for cset in try_charsets:
try:
- new_payload = six.text_type(payload, cset)
+ new_payload = payload.decode(cset)
break
except UnicodeDecodeError:
new_payload = None
import django
from django.urls import resolve
from django.urls.resolvers import get_resolver
-from django.utils import six
import openapi_core
from openapi_core.schema.schemas.models import Format
from openapi_core.wrappers.base import BaseOpenAPIResponse
self.regex = re.compile(regex, re.IGNORECASE)
def __call__(self, value):
- if not isinstance(value, six.text_type):
+ if not isinstance(value, str):
return False
if not value:
CUSTOM_FORMATTERS = {
- 'uri': Format(six.text_type, RegexValidator(
+ 'uri': Format(str, RegexValidator(
r'^(?:http|ftp)s?://'
r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' # noqa
r'localhost|'
r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'
r'(?::\d+)?'
r'(?:/?|[/?]\S+)$')),
- 'iso8601': Format(six.text_type, RegexValidator(
+ 'iso8601': Format(str, RegexValidator(
r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{6}$')),
- 'email': Format(six.text_type, RegexValidator(
+ 'email': Format(str, RegexValidator(
r'[^@]+@[^@]+\.[^@]+')),
}
+++ /dev/null
-From benh@kernel.crashing.org Fri Oct 22 11:51:02 2010\r
-Return-Path: <linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org>\r
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bilbo.ozlabs.org\r
-X-Spam-Level: \r
-X-Spam-Status: No, score=0.0 required=3.0 tests=none autolearn=disabled\r
- version=3.3.1\r
-X-Original-To: jk@ozlabs.org\r
-Delivered-To: jk@ozlabs.org\r
-Received: from bilbo.ozlabs.org (localhost [127.0.0.1])\r
- by ozlabs.org (Postfix) with ESMTP id ED4B3100937\r
- for <jk@ozlabs.org>; Fri, 22 Oct 2010 14:51:54 +1100 (EST)\r
-Received: by ozlabs.org (Postfix)\r
- id BF799B70CB; Fri, 22 Oct 2010 14:51:50 +1100 (EST)\r
-Delivered-To: linuxppc-dev@ozlabs.org\r
-Received: from gate.crashing.org (gate.crashing.org [63.228.1.57])\r
- (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
- (Client did not present a certificate)\r
- by ozlabs.org (Postfix) with ESMTPS id 94629B7043\r
- for <linuxppc-dev@ozlabs.org>; Fri, 22 Oct 2010 14:51:49 +1100 (EST)\r
-Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1])\r
- by gate.crashing.org (8.14.1/8.13.8) with ESMTP id o9M3p3SP018234;\r
- Thu, 21 Oct 2010 22:51:04 -0500\r
-Subject: [git pull] Please pull powerpc.git next branch\r
-From: Benjamin Herrenschmidt <benh@kernel.crashing.org>\r
-To: Linus Torvalds <torvalds@linux-foundation.org>\r
-Date: Fri, 22 Oct 2010 14:51:02 +1100\r
-Message-ID: <1287719462.2198.37.camel@pasglop>\r
-Mime-Version: 1.0\r
-X-Mailer: Evolution 2.30.3 \r
-Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,\r
- Andrew Morton <akpm@linux-foundation.org>,\r
- Linux Kernel list <linux-kernel@vger.kernel.org>\r
-X-BeenThere: linuxppc-dev@lists.ozlabs.org\r
-X-Mailman-Version: 2.1.13\r
-Precedence: list\r
-List-Id: Linux on PowerPC Developers Mail List <cbe-oss-dev.ozlabs.org>\r
-List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>,\r
- <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>\r
-List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev>\r
-List-Post: <mailto:linuxppc-dev@lists.ozlabs.org>\r
-List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>\r
-List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>,\r
- <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>\r
-Content-Type: text/plain;\r
- charset="us-ascii"\r
-Content-Transfer-Encoding: 7bit\r
-Sender: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org\r
-Errors-To: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org\r
-X-UID: 11446\r
-X-Length: 16781\r
-Status: R\r
-X-Status: N\r
-X-KMail-EncryptionState: \r
-X-KMail-SignatureState: \r
-X-KMail-MDN-Sent: \r
-\r
-Hi Linus !\r
-\r
-Here's powerpc's batch for this merge window. Mostly bits and pieces,\r
-such as Anton doing some performance tuning left and right, and the\r
-usual churn. One hilight is the support for the new Freescale e5500 core\r
-(64-bit BookE). Another one is that we now wire up the whole lot of\r
-socket calls as direct syscalls in addition to the old style indirect\r
-method.\r
-\r
-Cheers,\r
-Ben.\r
-\r
-The following changes since commit e10117d36ef758da0690c95ecffc09d5dd7da479:\r
- Linus Torvalds (1):\r
- Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev\r
-\r
-are available in the git repository at:\r
-\r
- git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next\r
-\r
-Andreas Schwab (1):\r
- powerpc: Remove fpscr use from [kvm_]cvt_{fd,df}\r
-\r
-Anton Blanchard (5):\r
- powerpc: Optimise 64bit csum_partial\r
- powerpc: Optimise 64bit csum_partial_copy_generic and add csum_and_copy_from_user\r
- powerpc: Add 64bit csum_and_copy_to_user\r
- powerpc: Feature nop out reservation clear when stcx checks address\r
- powerpc: Check end of stack canary at oops time\r
-\r
-Arnd Bergmann (1):\r
- powerpc/spufs: Use llseek in all file operations\r
-\r
-Benjamin Herrenschmidt (4):\r
- powerpc/dma: Add optional platform override of dma_set_mask()\r
- powerpc/dart_iommu: Support for 64-bit iommu bypass window on PCIe\r
- Merge remote branch 'kumar/merge' into next\r
- Merge remote branch 'jwb/next' into next\r
-\r
-Denis Kirjanov (1):\r
- powerpc: Use is_32bit_task() helper to test 32-bit binary\r
-\r
-Harninder Rai (1):\r
- powerpc/85xx: add cache-sram support\r
-\r
-Ian Munsie (1):\r
- powerpc: Wire up direct socket system calls\r
-\r
-Ilya Yanok (1):\r
- powerpc/mpc83xx: Support for MPC8308 P1M board\r
-\r
-Joe Perches (2):\r
- powerpc: Use static const char arrays\r
- powerpc: Remove pr_<level> uses of KERN_<level>\r
-\r
-Josh Boyer (1):\r
- powerpc/44x: Update ppc44x_defconfig\r
-\r
-Julia Lawall (7):\r
- powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak\r
- powerpc/maple: Add of_node_put to avoid memory leak\r
- powerpc/powermac/pfunc_core.c: Add of_node_put to avoid memory leak\r
- powerpc/cell: Add of_node_put to avoid memory leak\r
- powerpc/chrp/nvram.c: Add of_node_put to avoid memory leak\r
- powerpc/irq.c: Add of_node_put to avoid memory leak\r
- i2c/i2c-pasemi.c: Fix unsigned return type\r
-\r
-Kumar Gala (11):\r
- powerpc/ppc64e: Fix link problem when building ppc64e_defconfig\r
- powerpc/fsl-pci: Fix MSI support on 83xx platforms\r
- powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers\r
- powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips\r
- powerpc/fsl-booke: Add p3041 DS board support\r
- powerpc: Fix compile error with paca code on ppc64e\r
- powerpc/fsl-booke: Add support for FSL 64-bit e5500 core\r
- powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes\r
- powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips\r
- powerpc/fsl-booke: Add p5020 DS board support\r
- powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig\r
-\r
-Matthew McClintock (7):\r
- powerpc/mm: Assume first cpu is boot_cpuid not 0\r
- powerpc/kexec: make masking/disabling interrupts generic\r
- powerpc/85xx: Remove call to mpic_teardown_this_cpu in kexec\r
- powerpc/85xx: Minor fixups for kexec on 85xx\r
- powerpc/85xx: flush dcache before resetting cores\r
- powerpc/fsl_soc: Search all global-utilities nodes for rstccr\r
- powerpc/fsl_booke: Add support to boot from core other than 0\r
-\r
-Michael Neuling (1):\r
- powerpc: Move arch_sd_sibling_asym_packing() to smp.c\r
-\r
-Nathan Fontenot (3):\r
- powerpc/pseries: Export device tree updating routines\r
- powerpc/pseries: Export rtas_ibm_suspend_me()\r
- powerpc/pseries: Partition migration in the kernel\r
-\r
-Nishanth Aravamudan (8):\r
- powerpc/pci: Fix return type of BUID_{HI,LO} macros\r
- powerpc/dma: Fix dma_iommu_dma_supported compare\r
- powerpc/dma: Fix check for direct DMA support\r
- powerpc/vio: Use put_device() on device_register failure\r
- powerpc/viobus: Free TCE table on device release\r
- powerpc/pseries: Use kmemdup\r
- powerpc/pci: Cleanup device dma setup code\r
- powerpc/pseries/xics: Use cpu_possible_mask rather than cpu_all_mask\r
-\r
-Paul Gortmaker (1):\r
- powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT\r
-\r
-Paul Mackerras (5):\r
- powerpc: Abstract indexing of lppaca structs\r
- powerpc: Dynamically allocate most lppaca structs\r
- powerpc: Account time using timebase rather than PURR\r
- powerpc/pseries: Re-enable dispatch trace log userspace interface\r
- powerpc/perf: Fix sampling enable for PPC970\r
-\r
-Scott Wood (1):\r
- oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.\r
-\r
-Sean MacLennan (2):\r
- powerpc: Fix incorrect .stabs entry for copy_32.S\r
- powerpc: mtmsrd not defined\r
-\r
-Shaohui Xie (1):\r
- fsl_rio: Add comments for sRIO registers.\r
-\r
-Stephen Rothwell (1):\r
- powerpc: define a compat_sys_recv cond_syscall\r
-\r
-Timur Tabi (5):\r
- powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols\r
- powerpc/watchdog: Allow the Book-E driver to be compiled as a module\r
- powerpc/p1022: Add probing for individual DMA channels\r
- powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board\r
- powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option\r
-\r
-Tirumala Marri (1):\r
- powerpc/44x: Add support for the AMCC APM821xx SoC\r
-\r
-matt mooney (1):\r
- powerpc/Makefiles: Change to new flag variables\r
-\r
- arch/powerpc/boot/addnote.c | 4 +-\r
- arch/powerpc/boot/dts/bluestone.dts | 254 +++++++++++++\r
- arch/powerpc/boot/dts/mpc8308_p1m.dts | 332 ++++++++++++++++\r
- arch/powerpc/boot/dts/p1022ds.dts | 11 +\r
- arch/powerpc/configs/44x/bluestone_defconfig | 68 ++++\r
- arch/powerpc/configs/e55xx_smp_defconfig | 84 ++++\r
- arch/powerpc/configs/ppc44x_defconfig | 9 +-\r
- arch/powerpc/configs/ppc64e_defconfig | 4 +-\r
- arch/powerpc/include/asm/checksum.h | 10 +\r
- arch/powerpc/include/asm/compat.h | 4 +-\r
- arch/powerpc/include/asm/cputable.h | 14 +-\r
- arch/powerpc/include/asm/dma-mapping.h | 14 +-\r
- arch/powerpc/include/asm/elf.h | 2 +-\r
- arch/powerpc/include/asm/exception-64s.h | 3 +-\r
- arch/powerpc/include/asm/fsl_85xx_cache_sram.h | 48 +++\r
- arch/powerpc/include/asm/kexec.h | 1 +\r
- arch/powerpc/include/asm/kvm_fpu.h | 4 +-\r
- arch/powerpc/include/asm/lppaca.h | 29 ++\r
- arch/powerpc/include/asm/machdep.h | 3 +\r
- arch/powerpc/include/asm/mmu-book3e.h | 15 +\r
- arch/powerpc/include/asm/paca.h | 10 +-\r
- arch/powerpc/include/asm/page_64.h | 4 +-\r
- arch/powerpc/include/asm/ppc-pci.h | 4 +-\r
- arch/powerpc/include/asm/ppc_asm.h | 50 ++-\r
- arch/powerpc/include/asm/processor.h | 4 +-\r
- arch/powerpc/include/asm/pte-common.h | 7 +\r
- arch/powerpc/include/asm/rtas.h | 1 +\r
- arch/powerpc/include/asm/systbl.h | 19 +\r
- arch/powerpc/include/asm/system.h | 4 +-\r
- arch/powerpc/include/asm/time.h | 5 -\r
- arch/powerpc/include/asm/unistd.h | 21 +-\r
- arch/powerpc/kernel/Makefile | 4 +-\r
- arch/powerpc/kernel/align.c | 4 +-\r
- arch/powerpc/kernel/asm-offsets.c | 12 +-\r
- arch/powerpc/kernel/cpu_setup_44x.S | 1 +\r
- arch/powerpc/kernel/cpu_setup_fsl_booke.S | 15 +\r
- arch/powerpc/kernel/cputable.c | 43 ++-\r
- arch/powerpc/kernel/crash.c | 13 +-\r
- arch/powerpc/kernel/dma-iommu.c | 21 +-\r
- arch/powerpc/kernel/dma.c | 20 +-\r
- arch/powerpc/kernel/entry_64.S | 40 ++\r
- arch/powerpc/kernel/fpu.S | 10 -\r
- arch/powerpc/kernel/head_fsl_booke.S | 10 +-\r
- arch/powerpc/kernel/irq.c | 6 +-\r
- arch/powerpc/kernel/lparcfg.c | 14 +-\r
- arch/powerpc/kernel/machine_kexec.c | 24 ++\r
- arch/powerpc/kernel/machine_kexec_32.c | 4 +\r
- arch/powerpc/kernel/paca.c | 70 ++++-\r
- arch/powerpc/kernel/pci-common.c | 4 +-\r
- arch/powerpc/kernel/ppc970-pmu.c | 2 +\r
- arch/powerpc/kernel/process.c | 12 -\r
- arch/powerpc/kernel/ptrace.c | 2 +-\r
- arch/powerpc/kernel/rtas.c | 4 +-\r
- arch/powerpc/kernel/setup_32.c | 2 +-\r
- arch/powerpc/kernel/smp.c | 14 +-\r
- arch/powerpc/kernel/time.c | 275 +++++++-------\r
- arch/powerpc/kernel/traps.c | 5 +\r
- arch/powerpc/kernel/vdso.c | 6 +-\r
- arch/powerpc/kernel/vdso32/Makefile | 6 +-\r
- arch/powerpc/kernel/vdso64/Makefile | 6 +-\r
- arch/powerpc/kernel/vio.c | 10 +-\r
- arch/powerpc/kvm/Makefile | 2 +-\r
- arch/powerpc/kvm/book3s_paired_singles.c | 44 +--\r
- arch/powerpc/kvm/emulate.c | 4 +-\r
- arch/powerpc/kvm/fpu.S | 8 -\r
- arch/powerpc/lib/Makefile | 7 +-\r
- arch/powerpc/lib/checksum_64.S | 482 +++++++++++++++++-------\r
- arch/powerpc/lib/checksum_wrappers_64.c | 102 +++++\r
- arch/powerpc/lib/copy_32.S | 2 +-\r
- arch/powerpc/lib/ldstfp.S | 36 +-\r
- arch/powerpc/lib/locks.c | 4 +-\r
- arch/powerpc/lib/sstep.c | 8 +\r
- arch/powerpc/math-emu/Makefile | 2 +-\r
- arch/powerpc/mm/Makefile | 6 +-\r
- arch/powerpc/mm/fault.c | 6 +\r
- arch/powerpc/mm/fsl_booke_mmu.c | 15 +-\r
- arch/powerpc/mm/mmu_context_nohash.c | 6 +-\r
- arch/powerpc/mm/mmu_decl.h | 5 +-\r
- arch/powerpc/mm/tlb_nohash.c | 56 +++-\r
- arch/powerpc/mm/tlb_nohash_low.S | 2 +-\r
- arch/powerpc/oprofile/Makefile | 4 +-\r
- arch/powerpc/oprofile/backtrace.c | 2 +-\r
- arch/powerpc/oprofile/op_model_fsl_emb.c | 15 +-\r
- arch/powerpc/platforms/44x/Kconfig | 16 +\r
- arch/powerpc/platforms/44x/ppc44x_simple.c | 1 +\r
- arch/powerpc/platforms/83xx/Kconfig | 4 +-\r
- arch/powerpc/platforms/83xx/mpc830x_rdb.c | 3 +-\r
- arch/powerpc/platforms/85xx/Kconfig | 28 ++-\r
- arch/powerpc/platforms/85xx/Makefile | 2 +\r
- arch/powerpc/platforms/85xx/p1022_ds.c | 2 +\r
- arch/powerpc/platforms/85xx/p3041_ds.c | 64 ++++\r
- arch/powerpc/platforms/85xx/p5020_ds.c | 69 ++++\r
- arch/powerpc/platforms/85xx/smp.c | 83 ++++-\r
- arch/powerpc/platforms/Kconfig.cputype | 8 +-\r
- arch/powerpc/platforms/cell/ras.c | 4 +-\r
- arch/powerpc/platforms/cell/spider-pic.c | 4 +-\r
- arch/powerpc/platforms/cell/spufs/file.c | 18 +\r
- arch/powerpc/platforms/chrp/nvram.c | 4 +-\r
- arch/powerpc/platforms/iseries/Makefile | 2 +-\r
- arch/powerpc/platforms/iseries/dt.c | 4 +-\r
- arch/powerpc/platforms/iseries/smp.c | 2 +-\r
- arch/powerpc/platforms/maple/setup.c | 1 +\r
- arch/powerpc/platforms/powermac/pfunc_core.c | 9 +-\r
- arch/powerpc/platforms/pseries/Makefile | 13 +-\r
- arch/powerpc/platforms/pseries/dlpar.c | 7 +-\r
- arch/powerpc/platforms/pseries/dtl.c | 224 +++++++++---\r
- arch/powerpc/platforms/pseries/lpar.c | 25 ++-\r
- arch/powerpc/platforms/pseries/mobility.c | 362 ++++++++++++++++++\r
- arch/powerpc/platforms/pseries/pseries.h | 9 +\r
- arch/powerpc/platforms/pseries/setup.c | 52 +++\r
- arch/powerpc/platforms/pseries/xics.c | 2 +-\r
- arch/powerpc/sysdev/Makefile | 5 +-\r
- arch/powerpc/sysdev/dart_iommu.c | 74 ++++-\r
- arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 101 +++++\r
- arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 159 ++++++++\r
- arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 231 +++++++++++\r
- arch/powerpc/sysdev/fsl_msi.c | 9 +-\r
- arch/powerpc/sysdev/fsl_pci.c | 60 +++-\r
- arch/powerpc/sysdev/fsl_pci.h | 1 +\r
- arch/powerpc/sysdev/fsl_rio.c | 65 ++--\r
- arch/powerpc/sysdev/fsl_soc.c | 20 +-\r
- arch/powerpc/sysdev/mpc8xxx_gpio.c | 3 +\r
- arch/powerpc/sysdev/pmi.c | 2 +-\r
- arch/powerpc/xmon/Makefile | 4 +-\r
- drivers/i2c/busses/i2c-pasemi.c | 2 +-\r
- drivers/macintosh/via-pmu-led.c | 4 +-\r
- drivers/watchdog/Kconfig | 22 +-\r
- drivers/watchdog/booke_wdt.c | 47 ++-\r
- include/linux/pci_ids.h | 8 +\r
- kernel/sys_ni.c | 1 +\r
- 130 files changed, 3676 insertions(+), 683 deletions(-)\r
- create mode 100644 arch/powerpc/boot/dts/bluestone.dts\r
- create mode 100644 arch/powerpc/boot/dts/mpc8308_p1m.dts\r
- create mode 100644 arch/powerpc/configs/44x/bluestone_defconfig\r
- create mode 100644 arch/powerpc/configs/e55xx_smp_defconfig\r
- create mode 100644 arch/powerpc/include/asm/fsl_85xx_cache_sram.h\r
- create mode 100644 arch/powerpc/lib/checksum_wrappers_64.c\r
- create mode 100644 arch/powerpc/platforms/85xx/p3041_ds.c\r
- create mode 100644 arch/powerpc/platforms/85xx/p5020_ds.c\r
- create mode 100644 arch/powerpc/platforms/pseries/mobility.c\r
- create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h\r
- create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_sram.c\r
- create mode 100644 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c\r
-\r
-\r
-_______________________________________________\r
-Linuxppc-dev mailing list\r
-Linuxppc-dev@lists.ozlabs.org\r
-https://lists.ozlabs.org/listinfo/linuxppc-dev\r
from django.test import TestCase
from django.urls import reverse
from django.utils.http import urlencode
-from django.utils import six
-from django.utils.six.moves import range
-from django.utils.six.moves import zip
from patchwork.models import Bundle
from patchwork.models import BundlePatch
def test_empty_bundle(self):
response = self.client.get(bundle_mbox_url(self.bundle))
self.assertEqual(response.status_code, 200)
- self.assertEqual(response.content, six.b(''))
+ self.assertEqual(response.content, b'')
def test_non_empty_bundle(self):
self.bundle.append_patch(self.patches[0])
response = self.client.get(bundle_mbox_url(self.bundle))
self.assertEqual(response.status_code, 200)
- self.assertNotEqual(response.content, six.b(''))
+ self.assertNotEqual(response.content, b'')
class BundleUpdateTest(BundleTestBase):
from django.test import TestCase
from django.urls import reverse
-from django.utils.six.moves import range
from patchwork.tests.utils import create_person
from django.conf import settings
from django.test import TestCase
from django.urls import reverse
-from django.utils.six.moves import zip
from patchwork.models import Patch
from patchwork.tests.utils import create_patch
import os
import sys
+from io import StringIO
from django.core.management import call_command
-from django.utils.six import StringIO
from django.test import TestCase
from patchwork import models
from django.test import TestCase
from django.test import TransactionTestCase
-from django.utils import six
from patchwork.models import Comment
from patchwork.models import Patch
def load_mail(file_path):
- if six.PY3:
- with open(file_path, 'rb') as f:
- mail = email.message_from_binary_file(f)
- else:
- with open(file_path) as f:
- mail = email.message_from_file(f)
+ with open(file_path, 'rb') as f:
+ mail = email.message_from_binary_file(f)
return mail
def test_git_pull_request(self):
self._test_pull_request_parse('0001-git-pull-request.mbox')
- @unittest.skipIf(six.PY3, 'Breaks only on Python 2')
- def test_git_pull_request_crlf_newlines(self):
- # verify that we haven't munged the file
- crlf_file = os.path.join(TEST_MAIL_DIR,
- '0018-git-pull-request-crlf-newlines.mbox')
- with open(crlf_file) as f:
- message = f.read()
- self.assertIn('\r\n', message)
-
- # verify the file works
- self._test_pull_request_parse(
- '0018-git-pull-request-crlf-newlines.mbox')
-
def test_git_pull_wrapped_request(self):
self._test_pull_request_parse('0002-git-pull-request-wrapped.mbox')
# SPDX-License-Identifier: GPL-2.0-or-later
import unittest
+from xmlrpc import client as xmlrpc_client
from django.conf import settings
from django.test import LiveServerTestCase
from django.urls import reverse
-from django.utils.six.moves import xmlrpc_client
from patchwork.tests import utils
from django.conf import settings
from django.http import Http404
-from django.utils import six
from patchwork.models import Comment
from patchwork.models import Patch
mail['Date'] = email.utils.formatdate(utc_timestamp)
# NOTE(stephenfin) http://stackoverflow.com/a/28584090/613428
- if six.PY3:
- mail = mail.as_bytes(True).decode()
- else:
- mail = mail.as_string(True)
+ mail = mail.as_bytes(True).decode()
return mail
# SPDX-License-Identifier: GPL-2.0-or-later
import base64
-# NOTE(stephenfin) six does not seem to support this
-try:
- from DocXMLRPCServer import XMLRPCDocGenerator
-except ImportError:
- from xmlrpc.server import XMLRPCDocGenerator
+from xmlrpc.server import XMLRPCDocGenerator
import sys
from django.contrib.auth import authenticate
from django.http import HttpResponseServerError
from django.views.decorators.csrf import csrf_exempt
from django.urls import reverse
-from django.utils import six
-from django.utils.six.moves import xmlrpc_client
-from django.utils.six.moves.xmlrpc_server import SimpleXMLRPCDispatcher
+from xmlrpc import client as xmlrpc_client
+from xmlrpc.server import SimpleXMLRPCDispatcher
from patchwork.models import Check
from patchwork.models import Patch
def _marshaled_dispatch(self, request):
try:
- params, method = six.moves.xmlrpc_client.loads(request.body)
+ params, method = xmlrpc_client.loads(request.body)
response = self._dispatch(request, method, params)
# wrap response in a singleton tuple
response = (response,)
response = self.dumps(response, methodresponse=1)
- except six.moves.xmlrpc_client.Fault as fault:
+ except xmlrpc_client.Fault as fault:
response = self.dumps(fault)
except Exception: # noqa
# report exception back to server
response = self.dumps(
- six.moves.xmlrpc_client.Fault(
+ xmlrpc_client.Fault(
1, '%s:%s' % (sys.exc_info()[0], sys.exc_info()[1])),
)
'id': obj.id,
'email': obj.email,
'name': name,
- 'user': six.text_type(obj.user).encode('utf-8'),
+ 'user': str(obj.user).encode('utf-8'),
}
"""
return {
'id': obj.id,
- 'date': six.text_type(obj.date).encode('utf-8'),
+ 'date': str(obj.date).encode('utf-8'),
'filename': obj.filename,
'msgid': obj.msgid,
'name': obj.name,
- 'project': six.text_type(obj.project).encode('utf-8'),
+ 'project': str(obj.project).encode('utf-8'),
'project_id': obj.project_id,
- 'state': six.text_type(obj.state).encode('utf-8'),
+ 'state': str(obj.state).encode('utf-8'),
'state_id': obj.state_id,
'archived': obj.archived,
- 'submitter': six.text_type(obj.submitter).encode('utf-8'),
+ 'submitter': str(obj.submitter).encode('utf-8'),
'submitter_id': obj.submitter_id,
- 'delegate': six.text_type(obj.delegate).encode('utf-8'),
+ 'delegate': str(obj.delegate).encode('utf-8'),
'delegate_id': obj.delegate_id or 0,
'commit_ref': obj.commit_ref or '',
'hash': obj.hash or '',
object which is OK to send to the client."""
return {
'id': obj.id,
- 'date': six.text_type(obj.date).encode('utf-8'),
- 'patch': six.text_type(obj.patch).encode('utf-8'),
+ 'date': str(obj.date).encode('utf-8'),
+ 'patch': str(obj.patch).encode('utf-8'),
'patch_id': obj.patch_id,
- 'user': six.text_type(obj.user).encode('utf-8'),
+ 'user': str(obj.user).encode('utf-8'),
'user_id': obj.user_id,
'state': obj.get_state_display(),
'target_url': obj.target_url,
-Django~=2.2.0; python_version >= '3.5' # pyup: >= 2.2.0,<2.3.0
-djangorestframework~=3.11.0; python_version >= '3.5'
-django-filter~=2.2.0; python_version >= '3.5' # pyup: >=2.2.0,<2.3.0
-django-debug-toolbar~=2.0.0; python_version >= '3.5' # pyup: ignore
-django-dbbackup~=3.2.0 # pyup: >=3.2.0,<3.3.0
+Django~=2.2.0
+djangorestframework~=3.11.0
+django-filter~=2.2.0
+django-debug-toolbar~=2.0.0
+django-dbbackup~=3.2.0
-r requirements-test.txt
-Django~=2.2.0; python_version >= '3.5' # pyup: >=2.2.0,<2.3.0
-djangorestframework~=3.11.0; python_version >= '3.5' # pyup: >=3.10.0,<3.12.0
-django-filter~=2.2.0; python_version >= '3.5' # pyup: >=2.2.0,<2.3.0
-psycopg2-binary~=2.8.0 # pyup: >=2.8.0,<2.9.0
-sqlparse~=0.3.0 # pyup: >=0.3.0,<0.4.0
+Django~=2.2.0
+djangorestframework~=3.11.0
+django-filter~=2.2.0
+psycopg2-binary~=2.8.0
+sqlparse~=0.3.0
projects / thirdparty / patchwork.git / commitdiff
