Skip to content

Commit 12d4642

Browse files
jleightcapjleightcap
committed
Blind find-replace
Signed-off-by: Jack Leightcap <[email protected]>
1 parent e3a58f8 commit 12d4642

File tree

8 files changed

+49
-49
lines changed

8 files changed

+49
-49
lines changed

‎warehouse/accounts/forms.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848

4949
class UsernameMixin:
50-
username = wtforms.StringField(validators=[wtforms.validators.DataRequired()])
50+
username = wtforms.StringField(validators=[wtforms.validators.InputRequired()])
5151

5252
def validate_username(self, field):
5353
userid = self.user_service.find_userid(field.data)
@@ -61,7 +61,7 @@ def validate_username(self, field):
6161
class TOTPValueMixin:
6262
totp_value = wtforms.StringField(
6363
validators=[
64-
wtforms.validators.DataRequired(),
64+
wtforms.validators.InputRequired(),
6565
wtforms.validators.Regexp(
6666
rf"^ *([0-9] *){{{TOTP_LENGTH}}}$",
6767
message=_(
@@ -74,13 +74,13 @@ class TOTPValueMixin:
7474

7575

7676
class WebAuthnCredentialMixin:
77-
credential = wtforms.StringField(wtforms.validators.DataRequired())
77+
credential = wtforms.StringField(wtforms.validators.InputRequired())
7878

7979

8080
class RecoveryCodeValueMixin:
8181
recovery_code_value = wtforms.StringField(
8282
validators=[
83-
wtforms.validators.DataRequired(),
83+
wtforms.validators.InputRequired(),
8484
wtforms.validators.Regexp(
8585
rf"^ *([0-9a-f] *){{{2*RECOVERY_CODE_BYTES}}}$",
8686
message=_(
@@ -95,7 +95,7 @@ class RecoveryCodeValueMixin:
9595
class NewUsernameMixin:
9696
username = wtforms.StringField(
9797
validators=[
98-
wtforms.validators.DataRequired(),
98+
wtforms.validators.InputRequired(),
9999
wtforms.validators.Length(
100100
max=50, message=_("Choose a username with 50 characters or less.")
101101
),
@@ -130,7 +130,7 @@ def validate_username(self, field):
130130
class PasswordMixin:
131131
password = wtforms.PasswordField(
132132
validators=[
133-
wtforms.validators.DataRequired(),
133+
wtforms.validators.InputRequired(),
134134
wtforms.validators.Length(
135135
max=MAX_PASSWORD_SIZE,
136136
message=_("Password too long."),
@@ -174,7 +174,7 @@ def validate_password(self, field):
174174
class NewPasswordMixin:
175175
new_password = wtforms.PasswordField(
176176
validators=[
177-
wtforms.validators.DataRequired(),
177+
wtforms.validators.InputRequired(),
178178
wtforms.validators.Length(
179179
max=MAX_PASSWORD_SIZE,
180180
message=_("Password too long."),
@@ -187,7 +187,7 @@ class NewPasswordMixin:
187187

188188
password_confirm = wtforms.PasswordField(
189189
validators=[
190-
wtforms.validators.DataRequired(),
190+
wtforms.validators.InputRequired(),
191191
wtforms.validators.Length(
192192
max=MAX_PASSWORD_SIZE,
193193
message=_("Password too long."),
@@ -202,8 +202,8 @@ class NewPasswordMixin:
202202
# PasswordStrengthValidator of the new_password field, to ensure that the
203203
# newly set password doesn't contain any of them
204204
full_name = wtforms.StringField() # May be empty
205-
username = wtforms.StringField(validators=[wtforms.validators.DataRequired()])
206-
email = wtforms.StringField(validators=[wtforms.validators.DataRequired()])
205+
username = wtforms.StringField(validators=[wtforms.validators.InputRequired()])
206+
email = wtforms.StringField(validators=[wtforms.validators.InputRequired()])
207207

208208
def __init__(self, *args, breach_service, **kwargs):
209209
super().__init__(*args, **kwargs)
@@ -221,7 +221,7 @@ def validate_new_password(self, field):
221221
class NewEmailMixin:
222222
email = wtforms.fields.EmailField(
223223
validators=[
224-
wtforms.validators.DataRequired(),
224+
wtforms.validators.InputRequired(),
225225
wtforms.validators.Regexp(
226226
r".+@.+\..+", message=_("The email address isn't valid. Try again.")
227227
),
@@ -415,13 +415,13 @@ class ReAuthenticateForm(PasswordMixin, forms.Form):
415415
__params__ = ["username", "password", "next_route", "next_route_matchdict"]
416416

417417
username = wtforms.fields.HiddenField(
418-
validators=[wtforms.validators.DataRequired()]
418+
validators=[wtforms.validators.InputRequired()]
419419
)
420420
next_route = wtforms.fields.HiddenField(
421-
validators=[wtforms.validators.DataRequired()]
421+
validators=[wtforms.validators.InputRequired()]
422422
)
423423
next_route_matchdict = wtforms.fields.HiddenField(
424-
validators=[wtforms.validators.DataRequired()]
424+
validators=[wtforms.validators.InputRequired()]
425425
)
426426

427427
def __init__(self, *args, user_service, **kwargs):
@@ -462,7 +462,7 @@ def validate_recovery_code_value(self, field):
462462

463463
class RequestPasswordResetForm(forms.Form):
464464
username_or_email = wtforms.StringField(
465-
validators=[wtforms.validators.DataRequired()]
465+
validators=[wtforms.validators.InputRequired()]
466466
)
467467

468468
def __init__(self, *args, user_service, **kwargs):

‎warehouse/admin/views/banners.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,18 @@ class BannerForm(Form):
148148
name = wtforms.fields.StringField(
149149
validators=[
150150
wtforms.validators.Length(max=100),
151-
wtforms.validators.DataRequired(),
151+
wtforms.validators.InputRequired(),
152152
],
153153
)
154154
text = wtforms.fields.StringField(
155155
validators=[
156156
wtforms.validators.Length(max=280),
157-
wtforms.validators.DataRequired(),
157+
wtforms.validators.InputRequired(),
158158
],
159159
)
160160
link_url = wtforms.fields.StringField(
161161
validators=[
162-
wtforms.validators.DataRequired(),
162+
wtforms.validators.InputRequired(),
163163
URIValidator(),
164164
]
165165
)
@@ -179,4 +179,4 @@ class BannerForm(Form):
179179
active = wtforms.fields.BooleanField(
180180
validators=[wtforms.validators.Optional()], default=False
181181
)
182-
end = wtforms.fields.DateField(validators=[wtforms.validators.DataRequired()])
182+
end = wtforms.fields.DateField(validators=[wtforms.validators.InputRequired()])

‎warehouse/admin/views/sponsors.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SponsorForm(Form):
3030
name = wtforms.fields.StringField(
3131
validators=[
3232
wtforms.validators.Length(max=100),
33-
wtforms.validators.DataRequired(),
33+
wtforms.validators.InputRequired(),
3434
],
3535
)
3636
service = wtforms.fields.StringField(
@@ -39,7 +39,7 @@ class SponsorForm(Form):
3939

4040
link_url = wtforms.fields.StringField(
4141
validators=[
42-
wtforms.validators.DataRequired(),
42+
wtforms.validators.InputRequired(),
4343
URIValidator(),
4444
]
4545
)

‎warehouse/admin/views/users.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def user_list(request):
7474

7575

7676
class EmailForm(forms.Form):
77-
email = wtforms.fields.EmailField(validators=[wtforms.validators.DataRequired()])
77+
email = wtforms.fields.EmailField(validators=[wtforms.validators.InputRequired()])
7878
primary = wtforms.fields.BooleanField()
7979
verified = wtforms.fields.BooleanField()
8080
public = wtforms.fields.BooleanField()

‎warehouse/forklift/legacy.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ class MetadataForm(forms.Form):
418418
metadata_version = wtforms.StringField(
419419
description="Metadata-Version",
420420
validators=[
421-
wtforms.validators.DataRequired(),
421+
wtforms.validators.InputRequired(),
422422
wtforms.validators.AnyOf(
423423
# Note: This isn't really Metadata 2.0, however bdist_wheel
424424
# claims it is producing a Metadata 2.0 metadata when in
@@ -433,7 +433,7 @@ class MetadataForm(forms.Form):
433433
name = wtforms.StringField(
434434
description="Name",
435435
validators=[
436-
wtforms.validators.DataRequired(),
436+
wtforms.validators.InputRequired(),
437437
wtforms.validators.Regexp(
438438
PROJECT_NAME_RE,
439439
re.IGNORECASE,
@@ -447,7 +447,7 @@ class MetadataForm(forms.Form):
447447
version = wtforms.StringField(
448448
description="Version",
449449
validators=[
450-
wtforms.validators.DataRequired(),
450+
wtforms.validators.InputRequired(),
451451
wtforms.validators.Regexp(
452452
r"^(?!\s).*(?<!\s)$",
453453
message="Can't have leading or trailing whitespace.",
@@ -523,7 +523,7 @@ class MetadataForm(forms.Form):
523523
pyversion = wtforms.StringField(validators=[wtforms.validators.Optional()])
524524
filetype = wtforms.StringField(
525525
validators=[
526-
wtforms.validators.DataRequired(),
526+
wtforms.validators.InputRequired(),
527527
wtforms.validators.AnyOf(
528528
["bdist_egg", "bdist_wheel", "sdist"], message="Use a known file type."
529529
),

‎warehouse/forms.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# limitations under the License.
1212

1313
from wtforms import Form as BaseForm, StringField
14-
from wtforms.validators import DataRequired, StopValidation, ValidationError
14+
from wtforms.validators import InputRequired, StopValidation, ValidationError
1515
from zxcvbn import zxcvbn
1616

1717
from warehouse.i18n import KNOWN_LOCALES
@@ -124,7 +124,7 @@ def __init__(self, *args, db, **kwargs):
124124
class SetLocaleForm(Form):
125125
__params__ = ["locale_id"]
126126

127-
locale_id = StringField(validators=[DataRequired(message="Missing locale ID")])
127+
locale_id = StringField(validators=[InputRequired(message="Missing locale ID")])
128128

129129
def validate_locale_id(self, field):
130130
if field.data not in KNOWN_LOCALES.keys():

‎warehouse/manage/forms.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class RoleNameMixin:
4040
role_name = wtforms.SelectField(
4141
"Select role",
4242
choices=[("", "Select role"), ("Maintainer", "Maintainer"), ("Owner", "Owner")],
43-
validators=[wtforms.validators.DataRequired(message="Select role")],
43+
validators=[wtforms.validators.InputRequired(message="Select role")],
4444
)
4545

4646

@@ -49,13 +49,13 @@ class TeamProjectRoleNameMixin:
4949
"Select permissions",
5050
choices=[("", "Select role"), ("Maintainer", "Maintainer"), ("Owner", "Owner")],
5151
coerce=lambda string: TeamProjectRoleType(string) if string else None,
52-
validators=[wtforms.validators.DataRequired(message="Select role")],
52+
validators=[wtforms.validators.InputRequired(message="Select role")],
5353
)
5454

5555

5656
class UsernameMixin:
5757
username = wtforms.StringField(
58-
validators=[wtforms.validators.DataRequired(message="Specify username")]
58+
validators=[wtforms.validators.InputRequired(message="Specify username")]
5959
)
6060

6161
def validate_username(self, field):
@@ -212,7 +212,7 @@ class DeleteWebAuthnForm(forms.Form):
212212

213213
label = wtforms.StringField(
214214
validators=[
215-
wtforms.validators.DataRequired(message="Specify a device name"),
215+
wtforms.validators.InputRequired(message="Specify a device name"),
216216
wtforms.validators.Length(
217217
max=64, message=("Label must be 64 characters or less")
218218
),
@@ -238,7 +238,7 @@ class ProvisionWebAuthnForm(WebAuthnCredentialMixin, forms.Form):
238238

239239
label = wtforms.StringField(
240240
validators=[
241-
wtforms.validators.DataRequired(message="Specify a label"),
241+
wtforms.validators.InputRequired(message="Specify a label"),
242242
wtforms.validators.Length(
243243
max=64, message=("Label must be 64 characters or less")
244244
),
@@ -293,15 +293,15 @@ def __init__(self, *args, user_id, macaroon_service, project_names, **kwargs):
293293

294294
description = wtforms.StringField(
295295
validators=[
296-
wtforms.validators.DataRequired(message="Specify a token name"),
296+
wtforms.validators.InputRequired(message="Specify a token name"),
297297
wtforms.validators.Length(
298298
max=100, message="Description must be 100 characters or less"
299299
),
300300
]
301301
)
302302

303303
token_scope = wtforms.StringField(
304-
validators=[wtforms.validators.DataRequired(message="Specify the token scope")]
304+
validators=[wtforms.validators.InputRequired(message="Specify the token scope")]
305305
)
306306

307307
def validate_description(self, field):
@@ -347,7 +347,7 @@ class DeleteMacaroonForm(UsernameMixin, PasswordMixin, forms.Form):
347347
__params__ = ["confirm_password", "macaroon_id"]
348348

349349
macaroon_id = wtforms.StringField(
350-
validators=[wtforms.validators.DataRequired(message="Identifier required")]
350+
validators=[wtforms.validators.InputRequired(message="Identifier required")]
351351
)
352352

353353
def __init__(self, *args, macaroon_service, user_service, **kwargs):
@@ -381,14 +381,14 @@ class OrganizationRoleNameMixin:
381381
("Billing Manager", "Billing Manager"),
382382
],
383383
coerce=lambda string: OrganizationRoleType(string) if string else None,
384-
validators=[wtforms.validators.DataRequired(message="Select role")],
384+
validators=[wtforms.validators.InputRequired(message="Select role")],
385385
)
386386

387387

388388
class OrganizationNameMixin:
389389
name = wtforms.StringField(
390390
validators=[
391-
wtforms.validators.DataRequired(
391+
wtforms.validators.InputRequired(
392392
message="Specify organization account name"
393393
),
394394
wtforms.validators.Length(
@@ -487,7 +487,7 @@ class TransferOrganizationProjectForm(forms.Form):
487487
"Select organization",
488488
choices=[("", "Select organization")],
489489
validators=[
490-
wtforms.validators.DataRequired(message="Select organization"),
490+
wtforms.validators.InputRequired(message="Select organization"),
491491
],
492492
)
493493

@@ -538,7 +538,7 @@ class SaveOrganizationForm(forms.Form):
538538

539539
display_name = wtforms.StringField(
540540
validators=[
541-
wtforms.validators.DataRequired(message="Specify your organization name"),
541+
wtforms.validators.InputRequired(message="Specify your organization name"),
542542
wtforms.validators.Length(
543543
max=100,
544544
message=_(
@@ -550,7 +550,7 @@ class SaveOrganizationForm(forms.Form):
550550
)
551551
link_url = wtforms.URLField(
552552
validators=[
553-
wtforms.validators.DataRequired(message="Specify your organization URL"),
553+
wtforms.validators.InputRequired(message="Specify your organization URL"),
554554
wtforms.validators.Length(
555555
max=400,
556556
message=_(
@@ -566,7 +566,7 @@ class SaveOrganizationForm(forms.Form):
566566
)
567567
description = wtforms.TextAreaField(
568568
validators=[
569-
wtforms.validators.DataRequired(
569+
wtforms.validators.InputRequired(
570570
message="Specify your organization description"
571571
),
572572
wtforms.validators.Length(
@@ -582,7 +582,7 @@ class SaveOrganizationForm(forms.Form):
582582
choices=[("Company", "Company"), ("Community", "Community")],
583583
coerce=OrganizationType,
584584
validators=[
585-
wtforms.validators.DataRequired(message="Select organization type"),
585+
wtforms.validators.InputRequired(message="Select organization type"),
586586
],
587587
)
588588

@@ -609,7 +609,7 @@ class SaveTeamForm(forms.Form):
609609

610610
name = wtforms.StringField(
611611
validators=[
612-
wtforms.validators.DataRequired(message="Specify team name"),
612+
wtforms.validators.InputRequired(message="Specify team name"),
613613
wtforms.validators.Length(
614614
max=50,
615615
message=_("Choose a team name with 50 characters or less."),

0 commit comments

Comments
 (0)