This commit is contained in:
Ross Lawley 2013-05-07 11:01:23 +00:00
parent ddd11c7ed2
commit 52c162a478

View File

@ -108,8 +108,8 @@ class URLField(StringField):
_URL_REGEX = re.compile( _URL_REGEX = re.compile(
r'^(?:http|ftp)s?://' # http:// or https:// r'^(?:http|ftp)s?://' # http:// or https://
r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' #domain... r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' # domain...
r'localhost|' #localhost... r'localhost|' # localhost...
r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
r'(?::\d+)?' # optional port r'(?::\d+)?' # optional port
r'(?:/?|[/?]\S+)$', re.IGNORECASE) r'(?:/?|[/?]\S+)$', re.IGNORECASE)
@ -128,8 +128,7 @@ class URLField(StringField):
warnings.warn( warnings.warn(
"The URLField verify_exists argument has intractable security " "The URLField verify_exists argument has intractable security "
"and performance issues. Accordingly, it has been deprecated.", "and performance issues. Accordingly, it has been deprecated.",
DeprecationWarning DeprecationWarning)
)
try: try:
request = urllib2.Request(value) request = urllib2.Request(value)
urllib2.urlopen(request) urllib2.urlopen(request)
@ -469,7 +468,7 @@ class ComplexDateTimeField(StringField):
def __get__(self, instance, owner): def __get__(self, instance, owner):
data = super(ComplexDateTimeField, self).__get__(instance, owner) data = super(ComplexDateTimeField, self).__get__(instance, owner)
if data == None: if data is None:
return datetime.datetime.now() return datetime.datetime.now()
if isinstance(data, datetime.datetime): if isinstance(data, datetime.datetime):
return data return data
@ -1235,8 +1234,6 @@ class ImageGridFsProxy(GridFSProxy):
Insert a image in database Insert a image in database
applying field properties (size, thumbnail_size) applying field properties (size, thumbnail_size)
""" """
if not self.instance:
import ipdb; ipdb.set_trace();
field = self.instance._fields[self.key] field = self.instance._fields[self.key]
try: try:
@ -1308,6 +1305,7 @@ class ImageGridFsProxy(GridFSProxy):
height=h, height=h,
format=format, format=format,
**kwargs) **kwargs)
@property @property
def size(self): def size(self):
""" """