cleanup

diff --git a/telemeta/views/core.py b/telemeta/views/core.py
index d57490eacd01141167d46858800dc4c8bfaddc85..ad5b59317acc21469dcb474c53d4cbd3ab4f1764 100644 (file)
--- a/telemeta/views/core.py
+++ b/telemeta/views/core.py
@@ -106,25 +106,25 @@ def render(request, template, data = None, mimetype = None):
     return render_to_response(template, data, context_instance=RequestContext(request),
                               mimetype=mimetype)
 
-def stream_from_processor(_decoder, _proc, _flag, metadata=None):
+def stream_from_processor(_decoder, proc, flag, metadata=None):
     if metadata:
-        _proc.set_metadata(metadata)
-    _eod = False
-    while not _eod:
-        _frames, _eod = _proc.process(*_decoder.process())
-        yield _proc.chunk
-    _flag.value = True
-    _flag.save()
-
-def stream_from_file(__file):
+        proc.set_metadata(metadata)
+    eod = False
+    while not eod:
+        frames, eod = proc.process(*decoder.process())
+        yield proc.chunk
+    flag.value = True
+    flag.save()
+
+def stream_from_file(file):
     chunk_size = 0x100000
-    f = open(__file, 'r')
+    f = open(file, 'r')
     while True:
-        __chunk = f.read(chunk_size)
-        if not len(__chunk):
+        chunk = f.read(chunk_size)
+        if not len(chunk):
             f.close()
             break
-        yield __chunk
+        yield chunk
 
 def get_public_access(access, year_from=None, year_to=None):
     # Rolling publishing date : public access is given when time between recorded year

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index b64eb6e20b0bdf54040f67f0556337edf9e85af7..6e2b71ba543fd2e70c87d8bfc7aa730d20e314f7 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -529,8 +529,6 @@ class ItemView(object):
                 except:
                     pass
             response = HttpResponse(stream_from_file(audio), mimetype = mime_type)
-#            fsock = open(audio, 'r')
-#            response = HttpResponse(fsock, mimetype = mime_type)
         else:
             media = self.cache_export.dir + os.sep + file
             if not self.cache_export.exists(file) or not flag.value: