Changeset 2:e30d192e9031

Timestamp:

09/01/13 08:12:43 (8 years ago)

Author:

Simon Cross <hodgestar@…>

Branch:

default

Phase:

public

Message:

Fix PEP8 errors.

File:

• pyweek_upload.py (modified) (12 diffs)

pyweek_upload.py

@@ -4 +4 @@
 Handles authentication and gives upload progress feedback.
 '''
-import sys, os, httplib, cStringIO, socket, time, getopt
-
-class Upload:
+import sys
+import os
+import httplib
+import cStringIO
+import socket
+import time
+import getopt
+
+
+class Upload(object):
     def __init__(self, filename):
         self.filename = filename
@@ -13 +20 @@
 sep_boundary = '\n--' + boundary
 end_boundary = sep_boundary + '--'
+
 
 def mimeEncode(data, sep_boundary=sep_boundary, end_boundary=end_boundary):
@@ -21 +29 @@
     for key, value in data.items():
         # handle multiple entries for the same name
-        if type(value) != type([]): value = [value]
+        if not isinstance(value, list):
+            value = [value]
         for value in value:
             ret.write(sep_boundary)
             if isinstance(value, Upload):
-                ret.write('\nContent-Disposition: form-data; name="%s"'%key)
+                ret.write('\nContent-Disposition: form-data; name="%s"' % key)
                 filename = os.path.basename(value.filename)
-                ret.write('; filename="%s"\n\n'%filename)
+                ret.write('; filename="%s"\n\n' % filename)
                 value = open(os.path.join(value.filename), "rb").read()
             else:
-                ret.write('\nContent-Disposition: form-data; name="%s"'%key)
+                ret.write('\nContent-Disposition: form-data; name="%s"' % key)
                 ret.write("\n\n")
                 value = str(value)
@@ -39 +48 @@
     return ret.getvalue()
 
-class Progress:
+
+class Progress(object):
     def __init__(self, info, data):
         self.info = info
         self.tosend = len(data)
-        self.total = self.tosend/1024
+        self.total = self.tosend / 1024
         self.data = cStringIO.StringIO(data)
         self.start = self.now = time.time()
@@ -52 +62 @@
         self.display()
 
-    def __iter__(self): return self
+    def __iter__(self):
+        return self
 
     def next(self):
         self.num += 1
         if self.sent >= self.tosend:
-            print self.info, 'done', ' '*(75-len(self.info)-6)
+            print self.info, 'done', ' ' * (75 - len(self.info) - 6)
             sys.stdout.flush()
             raise StopIteration
@@ -79 +90 @@
         steptime = sum(self.steptimes) / len(self.steptimes)
         self.now = now
-        eta = steptime * ((self.total - self.num)/self.stepsize)
+        eta = steptime * ((self.total - self.num) / self.stepsize)
 
         # tell it like it is (or might be)
@@ -88 +99 @@
             S = eta % 60
             if self.total:
-                s = '%s %2d%% (ETA %02d:%02d:%02d)'%(self.info,
+                s = '%s %2d%% (ETA %02d:%02d:%02d)' % (self.info,
                     self.num * 100. / self.total, H, M, S)
             else:
-                s = '%s 0%% (ETA %02d:%02d:%02d)'%(self.info, H, M, S)
+                s = '%s 0%% (ETA %02d:%02d:%02d)' % (self.info, H, M, S)
         elif self.total:
-            s = '%s %2d%%'%(self.info, self.num * 100. / self.total)
+            s = '%s %2d%%' % (self.info, self.num * 100. / self.total)
         else:
-            s = '%s %d done'%(self.info, self.num)
-        sys.stdout.write(s + ' '*(75-len(s)) + '\r')
+            s = '%s %d done' % (self.info, self.num)
+        sys.stdout.write(s + ' ' * (75 - len(s)) + '\r')
         sys.stdout.flush()
+
 
 class progressHTTPConnection(httplib.HTTPConnection):
@@ -117 +129 @@
                 p.display()
 
+
 class progressHTTP(httplib.HTTP):
     _connection_class = progressHTTPConnection
+
     def _setup(self, conn):
         httplib.HTTP._setup(self, conn)
         self.progress_send = self._conn.progress_send
 
+
 def http_request(data, server, port, url):
     h = progressHTTP(server, port)
@@ -128 +143 @@
     data = mimeEncode(data)
     h.putrequest('POST', url)
-    h.putheader('Content-type', 'multipart/form-data; boundary=%s'%boundary)
+    h.putheader('Content-type', 'multipart/form-data; boundary=%s' % boundary)
     h.putheader('Content-length', str(len(data)))
     h.putheader('Host', server)
@@ -141 +156 @@
     f.close()
 
-    print '%s %s'%(errcode, errmsg)
-    if response: print response
+    print '%s %s' % (errcode, errmsg)
+    if response:
+        print response
+
 
 def usage():
@@ -179 +196 @@
     url = None
     for opt, arg in optlist:
-        if opt == '-u': data['user'] = arg
-        elif opt == '-p': data['password'] = arg
-        elif opt == '-s': optional['is_screenshot'] = 'yes'
-        elif opt == '-f': optional['is_final'] = 'yes'
-        elif opt == '-d': data['description'] = arg
-        elif opt == '-c': data['content_file'] = Upload(arg)
-        elif opt == '-e': url = '/e/%s/oup/'%arg
-        elif opt == '-h': host = arg
-        elif opt == '-P': port = int(arg)
+        if opt == '-u':
+            data['user'] = arg
+        elif opt == '-p':
+            data['password'] = arg
+        elif opt == '-s':
+            optional['is_screenshot'] = 'yes'
+        elif opt == '-f':
+            optional['is_final'] = 'yes'
+        elif opt == '-d':
+            data['description'] = arg
+        elif opt == '-c':
+            data['content_file'] = Upload(arg)
+        elif opt == '-e':
+            url = '/e/%s/oup/' % arg
+        elif opt == '-h':
+            host = arg
+        elif opt == '-P':
+            port = int(arg)
 
     if len(data) < 4 or url is None:
@@ -196 +222 @@
     data.update(optional)
     http_request(data, host, port, url)
-