cleanup

diff --git a/telemeta/cache.py b/telemeta/cache.py
index 02a2a842529b740f9e3afc4fde41cb35e49d2485..77b46a47ce1fae035436f50ce4f0ff0b5247a193 100644 (file)
--- a/telemeta/cache.py
+++ b/telemeta/cache.py
@@ -48,7 +48,7 @@ class TelemetaCache(object):
             try:
                 os.makedirs(dir)
             except IOError:
-                raise 'Could not create the '+dir+' directory !'
+                raise 'Could not create the ' + dir + ' directory !'
 
     def get_files(self):
         list = []
@@ -75,7 +75,7 @@ class TelemetaCache(object):
 
     def read_bin(self, file):
         path = self.dir + os.sep + file
-        f = open(path,  'r')
+        f = open(path, 'r')
         data = f.read()
         f.close()
         return data
@@ -83,7 +83,7 @@ class TelemetaCache(object):
     def read_stream_bin(self, file):
         path = self.dir + os.sep + file
         chunk_size = 0x80000
-        f = open(path,  'r')
+        f = open(path, 'r')
         while True:
             chunk = f.read(chunk_size)
             if not len(chunk):

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 2cbd3046c8c2660c223f0947e1d7f5d71697f8d6..e6deef29c4b85a9fe4618649d482226dda2ce914 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -76,7 +76,7 @@ app_name = 'telemeta'
 def get_random_hash():
     hash = random.getrandbits(64)
     return "%016x" % hash
-    
+
 
 class MediaResource(ModelCore):
     "Base class of all media objects"
@@ -153,7 +153,7 @@ class MediaRelated(MediaResource):
         return 'image' in self.mime_type or is_url_image
 
     def save(self, force_insert=False, force_update=False, author=None):
-        super(MediaRelated, self).save(force_insert, force_update)        
+        super(MediaRelated, self).save(force_insert, force_update)
 
     def set_mime_type(self):
         if self.file:
@@ -182,7 +182,7 @@ class MediaCollection(MediaResource):
         "Check if the collection code is well formed"
         regex = '^' + collection_code_regex + '$'
         if not re.match(regex, value):
-            raise ValidationError(u'%s is not a valid collection code' % value)
+            raise ValidationError('%s is not a valid collection code' % value)
 
     # General informations
     reference             = CharField(_('reference'), unique=True, null=True)
@@ -610,7 +610,7 @@ class MediaItemMarker(MediaResource):
     title           = CharField(_('title'))
     date            = DateTimeField(_('date'), auto_now=True)
     description     = TextField(_('description'))
-    author          = ForeignKey(User, related_name="markers", verbose_name=_('author'), 
+    author          = ForeignKey(User, related_name="markers", verbose_name=_('author'),
                                  blank=True, null=True)
 
     class Meta(MetaCore):