launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #02750
[Merge] lp:~jcsackett/launchpad/move-validators into lp:launchpad
j.c.sackett has proposed merging lp:~jcsackett/launchpad/move-validators into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~jcsackett/launchpad/move-validators/+merge/51031
Summary
=======
As part of ongoing efforts to find homes in the lp tree for things we're using in the canonical tree, I've moved canonical.launchpad.validators to lp.
This looks like a pretty big branch; it's all just moved files and rewritten imports.
Implementation
==============
lib/canonical/launchpad/validators => lib/lp/app/validators
Tons of redone imports.
Tests
=====
Basically, run it in ec2. It's running there now.
Demo & QA
=========
Not qa-able, near as I can tell. If tests/make don't crash and burn, we're good.
Lint
====
There are too many files changed in this to sensibly do linting.
--
https://code.launchpad.net/~jcsackett/launchpad/move-validators/+merge/51031
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jcsackett/launchpad/move-validators into lp:launchpad.
=== modified file 'lib/canonical/launchpad/configure.zcml'
--- lib/canonical/launchpad/configure.zcml 2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/configure.zcml 2011-02-23 23:19:35 +0000
@@ -13,7 +13,6 @@
<include package="canonical.launchpad.webapp" />
<include package="canonical.launchpad.vocabularies" />
<include file="links.zcml" />
- <include package="canonical.launchpad.validators" />
<include package="canonical.launchpad.zcml" />
<authorizations module="canonical.launchpad.security" />
<include package="canonical.launchpad.xmlrpc" />
=== modified file 'lib/canonical/launchpad/database/emailaddress.py'
--- lib/canonical/launchpad/database/emailaddress.py 2010-11-08 12:52:43 +0000
+++ lib/canonical/launchpad/database/emailaddress.py 2011-02-23 23:19:35 +0000
@@ -34,7 +34,7 @@
IEmailAddressSet,
InvalidEmailAddress,
)
-from canonical.launchpad.validators.email import valid_email
+from lp.app.validators.email import valid_email
class HasOwnerMixin:
=== modified file 'lib/canonical/launchpad/database/logintoken.py'
--- lib/canonical/launchpad/database/logintoken.py 2010-11-08 14:18:20 +0000
+++ lib/canonical/launchpad/database/logintoken.py 2011-02-23 23:19:35 +0000
@@ -43,7 +43,7 @@
format_address,
simple_sendmail,
)
-from canonical.launchpad.validators.email import valid_email
+from lp.app.validators.email import valid_email
from canonical.launchpad.webapp import canonical_url
from canonical.launchpad.webapp.interfaces import (
IStoreSelector,
=== modified file 'lib/canonical/launchpad/interfaces/validation.py'
--- lib/canonical/launchpad/interfaces/validation.py 2010-11-08 12:52:43 +0000
+++ lib/canonical/launchpad/interfaces/validation.py 2011-02-23 23:19:35 +0000
@@ -36,10 +36,10 @@
IEmailAddress,
IEmailAddressSet,
)
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.cve import valid_cve
-from canonical.launchpad.validators.email import valid_email
-from canonical.launchpad.validators.url import valid_absolute_url
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.cve import valid_cve
+from lp.app.validators.email import valid_email
+from lp.app.validators.url import valid_absolute_url
from canonical.launchpad.webapp import canonical_url
from canonical.launchpad.webapp.menu import structured
from lp.app.errors import NotFoundError
=== modified file 'lib/canonical/launchpad/mail/commands.py'
--- lib/canonical/launchpad/mail/commands.py 2010-11-08 13:11:30 +0000
+++ lib/canonical/launchpad/mail/commands.py 2011-02-23 23:19:35 +0000
@@ -39,7 +39,7 @@
get_error_message,
get_person_or_team,
)
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from canonical.launchpad.webapp.authorization import check_permission
from lp.app.errors import (
NotFoundError,
=== modified file 'lib/canonical/launchpad/utilities/gpghandler.py'
--- lib/canonical/launchpad/utilities/gpghandler.py 2010-08-27 13:15:43 +0000
+++ lib/canonical/launchpad/utilities/gpghandler.py 2011-02-23 23:19:35 +0000
@@ -40,7 +40,7 @@
MoreThanOneGPGKeyFound,
SecretGPGKeyImportDetected,
)
-from canonical.launchpad.validators.email import valid_email
+from lp.app.validators.email import valid_email
from lp.registry.interfaces.gpg import (
GPGKeyAlgorithm,
valid_fingerprint,
=== modified file 'lib/lp/app/browser/root.py'
--- lib/lp/app/browser/root.py 2010-11-23 23:22:27 +0000
+++ lib/lp/app/browser/root.py 2011-02-23 23:19:35 +0000
@@ -32,7 +32,7 @@
GoogleResponseError,
ISearchService,
)
-from canonical.launchpad.validators.name import sanitize_name
+from lp.app.validators.name import sanitize_name
from canonical.launchpad.webapp import LaunchpadView
from canonical.launchpad.webapp.authorization import check_permission
from canonical.launchpad.webapp.batching import BatchNavigator
=== renamed directory 'lib/canonical/launchpad/validators' => 'lib/lp/app/validators'
=== modified file 'lib/lp/app/validators/attachment.py'
--- lib/canonical/launchpad/validators/attachment.py 2010-08-20 20:31:18 +0000
+++ lib/lp/app/validators/attachment.py 2011-02-23 23:19:35 +0000
@@ -7,7 +7,7 @@
__all__ = ['attachment_size_constraint']
from canonical.config import config
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
def attachment_size_constraint(value):
=== modified file 'lib/lp/app/validators/configure.zcml'
--- lib/canonical/launchpad/validators/configure.zcml 2009-07-13 18:15:02 +0000
+++ lib/lp/app/validators/configure.zcml 2011-02-23 23:19:35 +0000
@@ -4,7 +4,7 @@
<configure xmlns="http://namespaces.zope.org/zope";>
- <class class="canonical.launchpad.validators.LaunchpadValidationError">
+ <class class="lp.app.validators.LaunchpadValidationError">
<require permission="zope.Public"
interface=".ILaunchpadValidationError" />
</class>
@@ -12,7 +12,7 @@
<!-- We define the permissions here, but register the actual view
in the zcml overrides, becase we need to replace the standard Z3
implementation with our own -->
- <class class="canonical.launchpad.validators.WidgetInputErrorView">
+ <class class="lp.app.validators.WidgetInputErrorView">
<require permission="zope.Public"
interface=".ILaunchpadWidgetInputErrorView" />
</class>
=== modified file 'lib/lp/app/validators/email.py'
--- lib/canonical/launchpad/validators/email.py 2009-06-25 05:30:52 +0000
+++ lib/lp/app/validators/email.py 2011-02-23 23:19:35 +0000
@@ -8,7 +8,7 @@
import re
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
def valid_email(emailaddr):
=== modified file 'lib/lp/app/validators/name.py'
--- lib/canonical/launchpad/validators/name.py 2010-08-20 20:31:18 +0000
+++ lib/lp/app/validators/name.py 2011-02-23 23:19:35 +0000
@@ -10,7 +10,7 @@
from textwrap import dedent
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.menu import structured
=== modified file 'lib/lp/app/validators/tests/test_validators.py'
--- lib/canonical/launchpad/validators/tests/test_validators.py 2010-10-04 19:50:45 +0000
+++ lib/lp/app/validators/tests/test_validators.py 2011-02-23 23:19:35 +0000
@@ -19,10 +19,10 @@
suite = TestSuite()
# Include the doctests in __init__.py.
- from canonical.launchpad import validators
+ from lp.app import validators
suite.addTest(DocTestSuite(validators))
- from canonical.launchpad.validators import email, name, url, version
+ from lp.app.validators import email, name, url, version
suite.addTest(suitefor(email))
suite.addTest(suitefor(name))
suite.addTest(suitefor(url))
=== modified file 'lib/lp/app/validators/url.py'
--- lib/canonical/launchpad/validators/url.py 2010-08-20 20:31:18 +0000
+++ lib/lp/app/validators/url.py 2011-02-23 23:19:35 +0000
@@ -6,7 +6,7 @@
from textwrap import dedent
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
def valid_absolute_url(name):
=== modified file 'lib/lp/app/widgets/announcementdate.py'
--- lib/lp/app/widgets/announcementdate.py 2011-02-02 15:43:31 +0000
+++ lib/lp/app/widgets/announcementdate.py 2011-02-23 23:19:35 +0000
@@ -27,7 +27,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.interfaces import IAlwaysSubmittedWidget
from lp.app.widgets.date import DateTimeWidget
from lp.app.widgets.itemswidgets import LaunchpadRadioWidget
=== modified file 'lib/lp/app/widgets/date.py'
--- lib/lp/app/widgets/date.py 2011-02-22 15:16:55 +0000
+++ lib/lp/app/widgets/date.py 2011-02-23 23:19:35 +0000
@@ -32,7 +32,7 @@
from z3c.ptcompat import ViewPageTemplateFile
from canonical.launchpad.webapp.interfaces import ILaunchBag
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
class DateTimeWidget(TextWidget):
=== modified file 'lib/lp/app/widgets/image.py'
--- lib/lp/app/widgets/image.py 2011-02-02 15:43:31 +0000
+++ lib/lp/app/widgets/image.py 2011-02-23 23:19:35 +0000
@@ -30,7 +30,7 @@
ILibraryFileAlias,
ILibraryFileAliasSet,
)
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.interfaces import IAlwaysSubmittedWidget
from lp.app.widgets.itemswidgets import LaunchpadRadioWidget
from lp.services.fields import KEEP_SAME_IMAGE
=== modified file 'lib/lp/app/widgets/launchpadtarget.py'
--- lib/lp/app/widgets/launchpadtarget.py 2011-02-02 15:43:31 +0000
+++ lib/lp/app/widgets/launchpadtarget.py 2011-02-23 23:19:35 +0000
@@ -24,7 +24,7 @@
from zope.schema import Choice
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.interfaces import (
IAlwaysSubmittedWidget,
IMultiLineWidgetLayout,
=== modified file 'lib/lp/app/widgets/location.py'
--- lib/lp/app/widgets/location.py 2011-02-01 21:03:45 +0000
+++ lib/lp/app/widgets/location.py 2011-02-23 23:19:35 +0000
@@ -24,7 +24,7 @@
from canonical.config import config
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.interfaces import (
ILaunchBag, IMultiLineWidgetLayout)
from lp.app.browser.tales import ObjectImageDisplayAPI
=== modified file 'lib/lp/app/widgets/product.py'
--- lib/lp/app/widgets/product.py 2011-02-04 13:57:57 +0000
+++ lib/lp/app/widgets/product.py 2011-02-23 23:19:35 +0000
@@ -29,8 +29,8 @@
Text,
)
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.email import email_validator
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.email import email_validator
from canonical.launchpad.webapp import canonical_url
from canonical.launchpad.webapp.interfaces import ILaunchBag
from canonical.launchpad.webapp.menu import structured
=== modified file 'lib/lp/app/widgets/project.py'
--- lib/lp/app/widgets/project.py 2011-02-01 21:03:45 +0000
+++ lib/lp/app/widgets/project.py 2011-02-23 23:19:35 +0000
@@ -16,7 +16,7 @@
from zope.schema import Choice
from lp.app.errors import UnexpectedFormData
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.interfaces import IAlwaysSubmittedWidget
=== modified file 'lib/lp/blueprints/interfaces/specification.py'
--- lib/lp/blueprints/interfaces/specification.py 2011-02-01 23:44:04 +0000
+++ lib/lp/blueprints/interfaces/specification.py 2011-02-23 23:19:35 +0000
@@ -46,7 +46,7 @@
from canonical.launchpad import _
from canonical.launchpad.interfaces.validation import valid_webref
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from lp.blueprints.enums import (
SpecificationDefinitionStatus,
SpecificationGoalStatus,
=== modified file 'lib/lp/blueprints/interfaces/sprint.py'
--- lib/lp/blueprints/interfaces/sprint.py 2010-08-20 20:31:18 +0000
+++ lib/lp/blueprints/interfaces/sprint.py 2011-02-23 23:19:35 +0000
@@ -32,7 +32,7 @@
from canonical.launchpad import _
from canonical.launchpad.interfaces.launchpad import IHasDrivers
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.app.interfaces.headings import IRootContext
from lp.blueprints.interfaces.specificationtarget import IHasSpecifications
from lp.registry.interfaces.role import IHasOwner
=== modified file 'lib/lp/bugs/browser/bugalsoaffects.py'
--- lib/lp/bugs/browser/bugalsoaffects.py 2011-02-02 15:43:31 +0000
+++ lib/lp/bugs/browser/bugalsoaffects.py 2011-02-23 23:19:35 +0000
@@ -39,8 +39,8 @@
valid_upstreamtask,
validate_new_distrotask,
)
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.email import email_validator
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.email import email_validator
from canonical.launchpad.webapp import canonical_url
from canonical.launchpad.webapp.interfaces import ILaunchBag
from canonical.launchpad.webapp.menu import structured
=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py 2011-02-22 04:14:38 +0000
+++ lib/lp/bugs/browser/bugtarget.py 2011-02-23 23:19:35 +0000
@@ -64,7 +64,7 @@
from canonical.launchpad.browser.librarian import ProxiedLibraryFileAlias
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
from canonical.launchpad.searchbuilder import any
-from canonical.launchpad.validators.name import valid_name_pattern
+from lp.app.validators.name import valid_name_pattern
from canonical.launchpad.webapp import (
canonical_url,
LaunchpadView,
=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py 2011-02-22 08:42:07 +0000
+++ lib/lp/bugs/browser/bugtask.py 2011-02-23 23:19:35 +0000
@@ -144,7 +144,7 @@
any,
NULL,
)
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp import (
canonical_url,
enabled_with_permission,
=== modified file 'lib/lp/bugs/browser/cve.py'
--- lib/lp/bugs/browser/cve.py 2010-11-23 23:22:27 +0000
+++ lib/lp/bugs/browser/cve.py 2011-02-23 23:19:35 +0000
@@ -16,7 +16,7 @@
from zope.component import getUtility
-from canonical.launchpad.validators.cve import valid_cve
+from lp.app.validators.cve import valid_cve
from canonical.launchpad.webapp import (
canonical_url,
ContextMenu,
=== modified file 'lib/lp/bugs/browser/widgets/bug.py'
--- lib/lp/bugs/browser/widgets/bug.py 2011-01-11 09:39:10 +0000
+++ lib/lp/bugs/browser/widgets/bug.py 2011-02-23 23:19:35 +0000
@@ -23,7 +23,7 @@
from zope.component import getUtility
from zope.schema.interfaces import ConstraintNotSatisfied
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from lp.app.errors import NotFoundError
from lp.bugs.interfaces.bug import IBugSet
=== modified file 'lib/lp/bugs/errors.py'
--- lib/lp/bugs/errors.py 2011-01-21 22:05:13 +0000
+++ lib/lp/bugs/errors.py 2011-02-23 23:19:35 +0000
@@ -11,7 +11,7 @@
from lazr.restful.declarations import webservice_error
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
class InvalidBugTargetType(Exception):
=== modified file 'lib/lp/bugs/externalbugtracker/trac.py'
--- lib/lp/bugs/externalbugtracker/trac.py 2011-01-23 09:34:35 +0000
+++ lib/lp/bugs/externalbugtracker/trac.py 2011-02-23 23:19:35 +0000
@@ -21,7 +21,7 @@
from canonical.config import config
from canonical.launchpad.interfaces.message import IMessageSet
-from canonical.launchpad.validators.email import valid_email
+from lp.app.validators.email import valid_email
from canonical.launchpad.webapp.url import urlappend
from lp.bugs.externalbugtracker.base import (
BugNotFound,
=== modified file 'lib/lp/bugs/interfaces/bug.py'
--- lib/lp/bugs/interfaces/bug.py 2011-02-18 02:58:59 +0000
+++ lib/lp/bugs/interfaces/bug.py 2011-02-23 23:19:35 +0000
@@ -65,10 +65,10 @@
from canonical.launchpad import _
from canonical.launchpad.interfaces.launchpad import IPrivacy
from canonical.launchpad.interfaces.message import IMessage
-from canonical.launchpad.validators.attachment import (
+from lp.app.validators.attachment import (
attachment_size_constraint,
)
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.app.errors import NotFoundError
from lp.bugs.interfaces.bugactivity import IBugActivity
from lp.bugs.interfaces.bugattachment import IBugAttachment
=== modified file 'lib/lp/bugs/interfaces/bugmessage.py'
--- lib/lp/bugs/interfaces/bugmessage.py 2011-02-15 08:54:52 +0000
+++ lib/lp/bugs/interfaces/bugmessage.py 2011-02-23 23:19:35 +0000
@@ -28,7 +28,7 @@
from canonical.launchpad.interfaces.launchpad import IHasBug
from canonical.launchpad.interfaces.message import IMessage
-from canonical.launchpad.validators.attachment import (
+from lp.app.validators.attachment import (
attachment_size_constraint,
)
from lp.bugs.interfaces.bug import IBug
=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py 2011-02-22 22:05:16 +0000
+++ lib/lp/bugs/interfaces/bugtask.py 2011-02-23 23:19:35 +0000
@@ -105,8 +105,8 @@
any,
NULL,
)
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.name import name_validator
from canonical.launchpad.webapp.interfaces import ITableBatchNavigator
from lp.bugs.interfaces.bugwatch import (
IBugWatch,
=== modified file 'lib/lp/bugs/interfaces/bugtracker.py'
--- lib/lp/bugs/interfaces/bugtracker.py 2010-11-04 02:32:16 +0000
+++ lib/lp/bugs/interfaces/bugtracker.py 2011-02-23 23:19:35 +0000
@@ -61,8 +61,8 @@
from canonical.launchpad import _
from canonical.launchpad.components.apihelpers import patch_reference_property
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.name import name_validator
from lp.services.fields import (
ContentNameField,
StrippedTextLine,
=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py 2011-02-23 06:40:19 +0000
+++ lib/lp/bugs/model/bug.py 2011-02-23 23:19:35 +0000
@@ -101,7 +101,7 @@
IMessage,
IndexedMessage,
)
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.authorization import check_permission
from canonical.launchpad.webapp.interfaces import (
DEFAULT_FLAVOR,
=== modified file 'lib/lp/bugs/model/bugtracker.py'
--- lib/lp/bugs/model/bugtracker.py 2011-01-20 19:39:08 +0000
+++ lib/lp/bugs/model/bugtracker.py 2011-02-23 23:19:35 +0000
@@ -61,8 +61,8 @@
from canonical.launchpad.helpers import shortlist
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
from canonical.launchpad.interfaces.lpstorm import IStore
-from canonical.launchpad.validators.email import valid_email
-from canonical.launchpad.validators.name import sanitize_name
+from lp.app.validators.email import valid_email
+from lp.app.validators.name import sanitize_name
from lp.app.errors import NotFoundError
from lp.bugs.interfaces.bugtracker import (
BugTrackerType,
=== modified file 'lib/lp/bugs/model/bugwatch.py'
--- lib/lp/bugs/model/bugwatch.py 2011-01-20 19:39:08 +0000
+++ lib/lp/bugs/model/bugwatch.py 2011-02-23 23:19:35 +0000
@@ -54,7 +54,7 @@
from canonical.launchpad.helpers import shortlist
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
from canonical.launchpad.interfaces.lpstorm import IStore
-from canonical.launchpad.validators.email import valid_email
+from lp.app.validators.email import valid_email
from canonical.launchpad.webapp import (
urlappend,
urlsplit,
=== modified file 'lib/lp/bugs/model/cve.py'
--- lib/lp/bugs/model/cve.py 2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/model/cve.py 2011-02-23 23:19:35 +0000
@@ -29,7 +29,7 @@
SQLBase,
sqlvalues,
)
-from canonical.launchpad.validators.cve import valid_cve
+from lp.app.validators.cve import valid_cve
from lp.bugs.interfaces.buglink import IBugLinkTarget
from lp.bugs.interfaces.cve import (
CveStatus,
=== modified file 'lib/lp/buildmaster/interfaces/builder.py'
--- lib/lp/buildmaster/interfaces/builder.py 2010-11-29 14:51:07 +0000
+++ lib/lp/buildmaster/interfaces/builder.py 2011-02-23 23:19:35 +0000
@@ -43,8 +43,8 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import name_validator
-from canonical.launchpad.validators.url import builder_url_validator
+from lp.app.validators.name import name_validator
+from lp.app.validators.url import builder_url_validator
from lp.registry.interfaces.role import IHasOwner
from lp.services.fields import (
Description,
=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py 2011-02-23 02:08:58 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py 2011-02-23 23:19:35 +0000
@@ -52,7 +52,7 @@
from canonical.database.constants import UTC_NOW
from canonical.launchpad import _
from canonical.launchpad.browser.launchpad import Hierarchy
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from canonical.launchpad.webapp import (
canonical_url,
ContextMenu,
=== modified file 'lib/lp/code/browser/widgets/branch.py'
--- lib/lp/code/browser/widgets/branch.py 2011-02-02 15:11:18 +0000
+++ lib/lp/code/browser/widgets/branch.py 2011-02-23 23:19:35 +0000
@@ -18,7 +18,7 @@
from zope.app.form.interfaces import ConversionError
from zope.component import getUtility
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.interfaces import ILaunchBag
from canonical.launchpad.webapp.menu import structured
from lp.app.browser.tales import BranchFormatterAPI
=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py 2011-02-04 16:34:12 +0000
+++ lib/lp/code/interfaces/branch.py 2011-02-23 23:19:35 +0000
@@ -66,7 +66,7 @@
from canonical.config import config
from canonical.launchpad import _
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.interfaces import ITableBatchNavigator
from canonical.launchpad.webapp.menu import structured
from lp.code.bzr import (
=== modified file 'lib/lp/code/interfaces/codehosting.py'
--- lib/lp/code/interfaces/codehosting.py 2010-09-03 04:22:48 +0000
+++ lib/lp/code/interfaces/codehosting.py 2011-02-23 23:19:35 +0000
@@ -27,7 +27,7 @@
from zope.interface import Interface
from canonical.config import config
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from canonical.launchpad.webapp.interfaces import ILaunchpadApplication
# When LAUNCHPAD_SERVICES is provided as a login ID to XML-RPC methods, they
=== modified file 'lib/lp/code/interfaces/codeimport.py'
--- lib/lp/code/interfaces/codeimport.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/interfaces/codeimport.py 2011-02-23 23:19:35 +0000
@@ -39,7 +39,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from lp.code.enums import (
CodeImportReviewStatus,
RevisionControlSystems,
=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py 2011-02-22 23:07:17 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py 2011-02-23 23:19:35 +0000
@@ -51,7 +51,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.code.interfaces.branch import IBranch
from lp.registry.interfaces.distroseries import IDistroSeries
from lp.registry.interfaces.pocket import PackagePublishingPocket
=== modified file 'lib/lp/code/model/branchlookup.py'
--- lib/lp/code/model/branchlookup.py 2010-09-28 21:27:42 +0000
+++ lib/lp/code/model/branchlookup.py 2011-02-23 23:19:35 +0000
@@ -27,7 +27,7 @@
IMasterStore,
ISlaveStore,
)
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from canonical.launchpad.webapp.authorization import check_permission
from canonical.launchpad.webapp.interfaces import (
DEFAULT_FLAVOR,
=== modified file 'lib/lp/code/model/tests/test_branchnamespace.py'
--- lib/lp/code/model/tests/test_branchnamespace.py 2010-10-04 20:46:55 +0000
+++ lib/lp/code/model/tests/test_branchnamespace.py 2011-02-23 23:19:35 +0000
@@ -11,7 +11,7 @@
from zope.security.proxy import removeSecurityProxy
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.testing.layers import DatabaseFunctionalLayer
from lp.code.enums import (
BranchLifecycleStatus,
=== modified file 'lib/lp/code/tests/test_branchurifield.py'
--- lib/lp/code/tests/test_branchurifield.py 2010-10-04 19:50:45 +0000
+++ lib/lp/code/tests/test_branchurifield.py 2011-02-23 23:19:35 +0000
@@ -10,7 +10,7 @@
import unittest
from canonical.config import config
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp.vhosts import allvhosts
from canonical.testing.layers import LaunchpadZopelessLayer
from lp.code.interfaces.branch import (
=== modified file 'lib/lp/code/xmlrpc/branch.py'
--- lib/lp/code/xmlrpc/branch.py 2010-09-29 14:16:22 +0000
+++ lib/lp/code/xmlrpc/branch.py 2011-02-23 23:19:35 +0000
@@ -25,7 +25,7 @@
)
from canonical.config import config
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp import (
canonical_url,
LaunchpadXMLRPCView,
=== modified file 'lib/lp/code/xmlrpc/codehosting.py'
--- lib/lp/code/xmlrpc/codehosting.py 2010-10-12 02:57:28 +0000
+++ lib/lp/code/xmlrpc/codehosting.py 2011-02-23 23:19:35 +0000
@@ -24,7 +24,7 @@
from zope.security.management import endInteraction
from zope.security.proxy import removeSecurityProxy
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp import LaunchpadXMLRPCView
from canonical.launchpad.webapp.authorization import check_permission
from canonical.launchpad.webapp.interaction import setupInteractionForPerson
=== modified file 'lib/lp/codehosting/inmemory.py'
--- lib/lp/codehosting/inmemory.py 2010-09-22 18:32:22 +0000
+++ lib/lp/codehosting/inmemory.py 2011-02-23 23:19:35 +0000
@@ -24,7 +24,7 @@
from zope.interface import implementer
from canonical.database.constants import UTC_NOW
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.xmlrpc import faults
from lp.code.bzr import (
BranchFormat,
=== modified file 'lib/lp/hardwaredb/interfaces/hwdb.py'
--- lib/lp/hardwaredb/interfaces/hwdb.py 2011-01-26 19:35:17 +0000
+++ lib/lp/hardwaredb/interfaces/hwdb.py 2011-02-23 23:19:35 +0000
@@ -83,9 +83,9 @@
from canonical.launchpad import _
from canonical.launchpad.interfaces.launchpad import IPrivacy
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.email import valid_email
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.email import valid_email
+from lp.app.validators.name import valid_name
from canonical.launchpad.webapp.interfaces import ILaunchpadApplication
from lp.registry.interfaces.distribution import IDistribution
from lp.registry.interfaces.distroseries import IDistroSeries
=== modified file 'lib/lp/hardwaredb/model/hwdb.py'
--- lib/lp/hardwaredb/model/hwdb.py 2010-11-05 14:16:43 +0000
+++ lib/lp/hardwaredb/model/hwdb.py 2011-02-23 23:19:35 +0000
@@ -65,7 +65,7 @@
)
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from canonical.launchpad.webapp.interfaces import (
DEFAULT_FLAVOR,
IStoreSelector,
=== modified file 'lib/lp/registry/browser/objectreassignment.py'
--- lib/lp/registry/browser/objectreassignment.py 2011-02-02 15:43:31 +0000
+++ lib/lp/registry/browser/objectreassignment.py 2011-02-23 23:19:35 +0000
@@ -24,7 +24,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from canonical.launchpad.webapp import canonical_url
from lp.app.browser.launchpadform import (
action,
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2011-02-11 23:33:42 +0000
+++ lib/lp/registry/browser/person.py 2011-02-23 23:19:35 +0000
@@ -176,7 +176,7 @@
)
from canonical.launchpad.interfaces.oauth import IOAuthConsumerSet
from canonical.launchpad.mailnotification import send_direct_contact_email
-from canonical.launchpad.validators.email import valid_email
+from lp.app.validators.email import valid_email
from canonical.launchpad.webapp import (
ApplicationMenu,
canonical_url,
=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py 2011-02-05 06:11:48 +0000
+++ lib/lp/registry/browser/team.py 2011-02-23 23:19:35 +0000
@@ -46,7 +46,7 @@
from canonical.launchpad.interfaces.emailaddress import IEmailAddressSet
from canonical.launchpad.interfaces.logintoken import ILoginTokenSet
from canonical.launchpad.interfaces.validation import validate_new_team_email
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.launchpad.webapp import (
canonical_url,
LaunchpadView,
=== modified file 'lib/lp/registry/interfaces/distribution.py'
--- lib/lp/registry/interfaces/distribution.py 2011-02-20 22:26:17 +0000
+++ lib/lp/registry/interfaces/distribution.py 2011-02-23 23:19:35 +0000
@@ -57,7 +57,7 @@
IHasAppointedDriver,
IHasDrivers,
)
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.app.errors import NameLookupFailed
from lp.app.interfaces.headings import IRootContext
from lp.app.interfaces.launchpad import (
=== modified file 'lib/lp/registry/interfaces/distributionmirror.py'
--- lib/lp/registry/interfaces/distributionmirror.py 2011-01-20 17:54:24 +0000
+++ lib/lp/registry/interfaces/distributionmirror.py 2011-02-23 23:19:35 +0000
@@ -55,8 +55,8 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.name import name_validator
from canonical.launchpad.webapp.menu import structured
from lp.services.fields import (
ContentNameField,
=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py 2011-02-20 22:26:17 +0000
+++ lib/lp/registry/interfaces/distroseries.py 2011-02-23 23:19:35 +0000
@@ -52,10 +52,10 @@
from canonical.launchpad import _
from canonical.launchpad.interfaces.launchpad import IHasAppointedDriver
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.email import email_validator
-from canonical.launchpad.validators.name import name_validator
-from canonical.launchpad.validators.version import sane_version
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.email import email_validator
+from lp.app.validators.name import name_validator
+from lp.app.validators.version import sane_version
from lp.app.interfaces.launchpad import IServiceUsage
from lp.blueprints.interfaces.specificationtarget import ISpecificationGoal
from lp.bugs.interfaces.bugtarget import (
=== modified file 'lib/lp/registry/interfaces/milestone.py'
--- lib/lp/registry/interfaces/milestone.py 2011-01-21 08:12:29 +0000
+++ lib/lp/registry/interfaces/milestone.py 2011-02-23 23:19:35 +0000
@@ -48,7 +48,7 @@
from canonical.launchpad.components.apihelpers import (
patch_plain_parameter_type,
)
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.bugs.interfaces.bugtarget import (
IHasBugs,
IHasOfficialBugTags,
=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py 2011-02-16 11:03:04 +0000
+++ lib/lp/registry/interfaces/person.py 2011-02-23 23:19:35 +0000
@@ -102,9 +102,9 @@
IPrivacy,
)
from canonical.launchpad.interfaces.validation import validate_new_team_email
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.email import email_validator
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.email import email_validator
+from lp.app.validators.name import name_validator
from canonical.launchpad.webapp.authorization import check_permission
from canonical.launchpad.webapp.interfaces import ILaunchpadApplication
from lp.app.errors import NameLookupFailed
=== modified file 'lib/lp/registry/interfaces/poll.py'
--- lib/lp/registry/interfaces/poll.py 2011-01-05 19:18:57 +0000
+++ lib/lp/registry/interfaces/poll.py 2011-02-23 23:19:35 +0000
@@ -46,7 +46,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.registry.interfaces.person import ITeam
from lp.services.fields import ContentNameField
=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py 2011-01-24 20:53:10 +0000
+++ lib/lp/registry/interfaces/product.py 2011-02-23 23:19:35 +0000
@@ -77,8 +77,8 @@
IHasLogo,
IHasMugshot,
)
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.name import name_validator
from lp.app.errors import NameLookupFailed
from lp.app.interfaces.headings import IRootContext
from lp.app.interfaces.launchpad import (
=== modified file 'lib/lp/registry/interfaces/productrelease.py'
--- lib/lp/registry/interfaces/productrelease.py 2011-01-31 20:28:48 +0000
+++ lib/lp/registry/interfaces/productrelease.py 2011-02-23 23:19:35 +0000
@@ -52,8 +52,8 @@
from canonical.config import config
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.version import sane_version
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.version import sane_version
from lp.services.fields import (
ContentNameField,
PersonChoice,
=== modified file 'lib/lp/registry/interfaces/productseries.py'
--- lib/lp/registry/interfaces/productseries.py 2011-01-21 08:12:29 +0000
+++ lib/lp/registry/interfaces/productseries.py 2011-02-23 23:19:35 +0000
@@ -47,8 +47,8 @@
from canonical.launchpad import _
from canonical.launchpad.interfaces.launchpad import IHasAppointedDriver
from canonical.launchpad.interfaces.validation import validate_url
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.name import name_validator
from canonical.launchpad.webapp.url import urlparse
from lp.app.errors import NameLookupFailed
from lp.app.interfaces.launchpad import IServiceUsage
=== modified file 'lib/lp/registry/interfaces/projectgroup.py'
--- lib/lp/registry/interfaces/projectgroup.py 2011-01-21 08:12:29 +0000
+++ lib/lp/registry/interfaces/projectgroup.py 2011-02-23 23:19:35 +0000
@@ -49,7 +49,7 @@
IHasLogo,
IHasMugshot,
)
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.app.interfaces.headings import IRootContext
from lp.app.interfaces.launchpad import IServiceUsage
from lp.blueprints.interfaces.specificationtarget import IHasSpecifications
=== modified file 'lib/lp/registry/interfaces/sourcepackagename.py'
--- lib/lp/registry/interfaces/sourcepackagename.py 2010-09-29 14:38:30 +0000
+++ lib/lp/registry/interfaces/sourcepackagename.py 2011-02-23 23:19:35 +0000
@@ -22,7 +22,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
class ISourcePackageName(Interface):
=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py 2011-02-22 08:17:43 +0000
+++ lib/lp/registry/model/distribution.py 2011-02-23 23:19:35 +0000
@@ -66,7 +66,7 @@
ILaunchpadCelebrities,
)
from canonical.launchpad.interfaces.lpstorm import IStore
-from canonical.launchpad.validators.name import (
+from lp.app.validators.name import (
sanitize_name,
valid_name,
)
=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py 2011-02-16 11:03:04 +0000
+++ lib/lp/registry/model/person.py 2011-02-23 23:19:35 +0000
@@ -163,8 +163,8 @@
IMasterStore,
IStore,
)
-from canonical.launchpad.validators.email import valid_email
-from canonical.launchpad.validators.name import (
+from lp.app.validators.email import valid_email
+from lp.app.validators.name import (
sanitize_name,
valid_name,
)
@@ -4472,7 +4472,7 @@
def generate_nick(email_addr, is_registered=_is_nick_registered):
"""Generate a LaunchPad nick from the email address provided.
- See canonical.launchpad.validators.name for the definition of a
+ See lp.app.validators.name for the definition of a
valid nick.
It is technically possible for this function to raise a
=== modified file 'lib/lp/registry/scripts/keyringtrustanalyser.py'
--- lib/lp/registry/scripts/keyringtrustanalyser.py 2010-08-20 20:31:18 +0000
+++ lib/lp/registry/scripts/keyringtrustanalyser.py 2011-02-23 23:19:35 +0000
@@ -7,7 +7,7 @@
from canonical.database.sqlbase import flush_database_updates
from canonical.launchpad.interfaces.emailaddress import IEmailAddressSet
from canonical.launchpad.interfaces.gpghandler import IGPGHandler
-from canonical.launchpad.validators.email import valid_email
+from lp.app.validators.email import valid_email
from lp.registry.interfaces.person import (
IPersonSet,
PersonCreationRationale,
=== modified file 'lib/lp/registry/scripts/productreleasefinder/finder.py'
--- lib/lp/registry/scripts/productreleasefinder/finder.py 2010-08-20 20:31:18 +0000
+++ lib/lp/registry/scripts/productreleasefinder/finder.py 2011-02-23 23:19:35 +0000
@@ -18,8 +18,8 @@
import pytz
from zope.component import getUtility
-from canonical.launchpad.validators.name import invalid_name_pattern
-from canonical.launchpad.validators.version import sane_version
+from lp.app.validators.name import invalid_name_pattern
+from lp.app.validators.version import sane_version
from lp.registry.interfaces.product import IProductSet
from lp.registry.interfaces.productrelease import UpstreamFileType
from lp.registry.interfaces.series import SeriesStatus
=== modified file 'lib/lp/services/fields/__init__.py'
--- lib/lp/services/fields/__init__.py 2011-02-10 14:20:12 +0000
+++ lib/lp/services/fields/__init__.py 2011-02-23 23:19:35 +0000
@@ -100,8 +100,8 @@
from zope.security.interfaces import ForbiddenAttribute
from canonical.launchpad import _
-from canonical.launchpad.validators import LaunchpadValidationError
-from canonical.launchpad.validators.name import (
+from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.name import (
name_validator,
valid_name,
)
=== modified file 'lib/lp/services/fields/tests/test_fields.py'
--- lib/lp/services/fields/tests/test_fields.py 2011-02-10 14:20:12 +0000
+++ lib/lp/services/fields/tests/test_fields.py 2011-02-23 23:19:35 +0000
@@ -14,7 +14,7 @@
from zope.schema.interfaces import TooShort
from canonical.launchpad.interfaces.lpstorm import IStore
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from canonical.testing.layers import DatabaseFunctionalLayer
from lp.services.fields import (
BaseImageUpload,
=== modified file 'lib/lp/services/worlddata/interfaces/country.py'
--- lib/lp/services/worlddata/interfaces/country.py 2011-01-31 16:01:21 +0000
+++ lib/lp/services/worlddata/interfaces/country.py 2011-02-23 23:19:35 +0000
@@ -32,7 +32,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from lp.services.fields import (
Description,
Title,
=== modified file 'lib/lp/shipit.py'
--- lib/lp/shipit.py 2010-12-14 09:51:23 +0000
+++ lib/lp/shipit.py 2011-02-23 23:19:35 +0000
@@ -45,7 +45,7 @@
setUp as sd_setUp,
tearDown as sd_tearDown,
)
-from canonical.launchpad.validators import LaunchpadValidationError
+from lp.app.validators import LaunchpadValidationError
from lp.app import versioninfo
from lp.app.versioninfo import revno
from canonical.launchpad.webapp import (
=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py 2011-02-08 15:08:59 +0000
+++ lib/lp/soyuz/interfaces/archive.py 2011-02-23 23:19:35 +0000
@@ -84,7 +84,7 @@
from canonical.launchpad import _
from canonical.launchpad.interfaces.launchpad import IPrivacy
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.app.errors import NameLookupFailed
from lp.registry.interfaces.gpg import IGPGKey
from lp.registry.interfaces.person import IPerson
=== modified file 'lib/lp/soyuz/interfaces/binarypackagename.py'
--- lib/lp/soyuz/interfaces/binarypackagename.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/interfaces/binarypackagename.py 2011-02-23 23:19:35 +0000
@@ -20,7 +20,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
class IBinaryPackageName(Interface):
=== modified file 'lib/lp/soyuz/interfaces/binarypackagerelease.py'
--- lib/lp/soyuz/interfaces/binarypackagerelease.py 2010-12-24 02:22:11 +0000
+++ lib/lp/soyuz/interfaces/binarypackagerelease.py 2011-02-23 23:19:35 +0000
@@ -36,7 +36,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.version import valid_debian_version
+from lp.app.validators.version import valid_debian_version
from lp.services.worlddata.interfaces.country import ICountry
from lp.soyuz.interfaces.archive import IArchive
=== modified file 'lib/lp/soyuz/interfaces/packageset.py'
--- lib/lp/soyuz/interfaces/packageset.py 2011-01-31 16:01:21 +0000
+++ lib/lp/soyuz/interfaces/packageset.py 2011-02-23 23:19:35 +0000
@@ -39,7 +39,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.app.errors import NameLookupFailed
from lp.registry.interfaces.distroseries import IDistroSeries
from lp.registry.interfaces.person import IPerson
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py 2011-02-18 22:55:56 +0000
+++ lib/lp/soyuz/model/archive.py 2011-02-23 23:19:35 +0000
@@ -62,7 +62,7 @@
ISlaveStore,
IStore,
)
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from canonical.launchpad.webapp.interfaces import (
DEFAULT_FLAVOR,
IStoreSelector,
=== modified file 'lib/lp/soyuz/scripts/gina/packages.py'
--- lib/lp/soyuz/scripts/gina/packages.py 2011-02-17 18:29:23 +0000
+++ lib/lp/soyuz/scripts/gina/packages.py 2011-02-23 23:19:35 +0000
@@ -30,7 +30,7 @@
from canonical.database.constants import UTC_NOW
from canonical.launchpad.scripts import log
-from canonical.launchpad.validators.version import valid_debian_version
+from lp.app.validators.version import valid_debian_version
from lp.archivepublisher.diskpool import poolify
from lp.archiveuploader.changesfile import ChangesFile
from lp.archiveuploader.utils import (
=== modified file 'lib/lp/soyuz/scripts/populate_archive.py'
--- lib/lp/soyuz/scripts/populate_archive.py 2010-08-23 16:51:11 +0000
+++ lib/lp/soyuz/scripts/populate_archive.py 2011-02-23 23:19:35 +0000
@@ -13,7 +13,7 @@
from zope.component import getUtility
from zope.security.proxy import removeSecurityProxy
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from lp.app.errors import NotFoundError
from lp.soyuz.adapters.packagelocation import build_package_location
from lp.soyuz.enums import ArchivePurpose
=== modified file 'lib/lp/translations/browser/translationimportqueue.py'
--- lib/lp/translations/browser/translationimportqueue.py 2011-01-12 08:52:40 +0000
+++ lib/lp/translations/browser/translationimportqueue.py 2011-02-23 23:19:35 +0000
@@ -25,7 +25,7 @@
)
from canonical.database.constants import UTC_NOW
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from canonical.launchpad.webapp import (
canonical_url,
GetitemNavigation,
=== modified file 'lib/lp/translations/interfaces/translationgroup.py'
--- lib/lp/translations/interfaces/translationgroup.py 2010-12-02 16:13:51 +0000
+++ lib/lp/translations/interfaces/translationgroup.py 2011-02-23 23:19:35 +0000
@@ -23,7 +23,7 @@
)
from canonical.launchpad import _
-from canonical.launchpad.validators.name import name_validator
+from lp.app.validators.name import name_validator
from lp.registry.interfaces.role import IHasOwner
from lp.services.fields import (
PublicPersonChoice,
=== modified file 'lib/lp/translations/tests/test_translationbranchapprover.py'
--- lib/lp/translations/tests/test_translationbranchapprover.py 2011-02-17 17:19:40 +0000
+++ lib/lp/translations/tests/test_translationbranchapprover.py 2011-02-23 23:19:35 +0000
@@ -9,7 +9,7 @@
from zope.component import getUtility
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
-from canonical.launchpad.validators.name import valid_name
+from lp.app.validators.name import valid_name
from canonical.librarian.testing.fake import FakeLibrarian
from canonical.testing.layers import (
LaunchpadZopelessLayer,
=== modified file 'lib/lp/translations/utilities/template.py'
--- lib/lp/translations/utilities/template.py 2011-02-17 17:19:40 +0000
+++ lib/lp/translations/utilities/template.py 2011-02-23 23:19:35 +0000
@@ -12,7 +12,7 @@
import os
-from canonical.launchpad.validators.name import sanitize_name
+from lp.app.validators.name import sanitize_name
GENERIC_TEMPLATE_NAMES = [
=== modified file 'override-includes/widgetinputerrors-configure.zcml'
--- override-includes/widgetinputerrors-configure.zcml 2009-07-13 18:15:02 +0000
+++ override-includes/widgetinputerrors-configure.zcml 2011-02-23 23:19:35 +0000
@@ -9,7 +9,7 @@
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.app.form.interfaces.IWidgetInputError"
provides="zope.app.form.browser.interfaces.IWidgetInputErrorView"
- factory="canonical.launchpad.validators.WidgetInputErrorView"
+ factory="lp.app.validators.WidgetInputErrorView"
permission="zope.Public"
/>
</configure>
