mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-21 09:49:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refs #23919 -- Removed six.<various>_types usage

Browse source 
Thanks Tim Graham and Simon Charette for the reviews.
This commit is contained in:
Claude Paroz 2016-12-29 16:27:49 +01:00
parent f6acd1d271
commit 7b2f2e74ad
213 changed files with 574 additions and 763 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django/utils/dateformat.py
View file

@ -15,7 +15,6 @@ import datetime
import re
import time
from django.utils import six
from django.utils.dates import (
MONTHS, MONTHS_3, MONTHS_ALT, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR,
)
@ -182,7 +181,7 @@ class TimeFormat(Formatter):
pass
if name is None:
name = self.format('O')
return six.text_type(name)
return str(name)
def u(self):
"Microseconds; i.e. '000000' to '999999'"
@ -350,7 +349,7 @@ class DateFormat(TimeFormat):
def y(self):
"Year, 2 digits; e.g. '99'"
return six.text_type(self.data.year)[2:]
return str(self.data.year)[2:]
def Y(self):
"Year, 4 digits; e.g. '1999'"