From c8edd0516401fa1231ac6c279ba590e9ffb089b1 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 26 Sep 2012 21:11:24 +0200
Subject: [PATCH] cleanup

---
 telemeta/views/core.py | 28 ++++++++++++++--------------
 telemeta/views/item.py |  2 --
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/telemeta/views/core.py b/telemeta/views/core.py
index d57490ea..ad5b5931 100644
--- 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 b64eb6e2..6e2b71ba 100644
--- 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:
-- 
2.39.5