diff options
| author | Gonzalo Odiard <godiard@gmail.com> | 2013-04-23 21:29:28 (GMT) |
|---|---|---|
| committer | Gonzalo Odiard <godiard@gmail.com> | 2013-04-23 21:29:28 (GMT) |
| commit | 5765ff4f3d242088249b0876683f7d1f217303fd (patch) | |
| tree | 227f09088ec1c1aa95b4485b08de4c9dc49cef71 | |
| parent | 6fb4593079e98f0cf8e29d97a82dfef7be118a10 (diff) | |
Pep8 fixes
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
| -rw-r--r-- | activity.py | 33 | ||||
| -rw-r--r-- | downloadmanager.py | 26 | ||||
| -rw-r--r-- | filepicker.py | 5 | ||||
| -rw-r--r-- | server.py | 13 |
4 files changed, 41 insertions, 36 deletions
diff --git a/activity.py b/activity.py index 16af039..2f52b4a 100644 --- a/activity.py +++ b/activity.py @@ -105,7 +105,7 @@ class JournalShare(activity.Activity): self.view = WebKit.WebView() self.view.connect('mime-type-policy-decision-requested', - self.__mime_type_policy_cb) + self.__mime_type_policy_cb) self.view.connect('download-requested', self.__download_requested_cb) try: @@ -115,7 +115,7 @@ class JournalShare(activity.Activity): pass self.view.load_html_string('<html><body>Loading...</body></html>', - 'file:///') + 'file:///') self.view.show() scrolled = Gtk.ScrolledWindow() @@ -137,7 +137,7 @@ class JournalShare(activity.Activity): self.connect("joined", self._joined_cb) else: self.view.load_uri('http://0.0.0.0:%d/web/index.html' % - self.port) + self.port) # if I am the server self._inhibit_suspend() @@ -154,7 +154,7 @@ class JournalShare(activity.Activity): result = chooser.run() if result == Gtk.ResponseType.ACCEPT: logging.debug('ObjectChooser: %r', - chooser.get_selected_object()) + chooser.get_selected_object()) jobject = chooser.get_selected_object() if jobject and jobject.file_path: self._shared_items.append(jobject.object_id) @@ -190,10 +190,11 @@ class JournalShare(activity.Activity): def _set_view_url(self, tube_id): chan = self.shared_activity.telepathy_tubes_chan iface = chan[telepathy.CHANNEL_TYPE_TUBES] - addr = iface.AcceptStreamTube(tube_id, - telepathy.SOCKET_ADDRESS_TYPE_IPV4, - telepathy.SOCKET_ACCESS_CONTROL_LOCALHOST, 0, - utf8_strings=True) + addr = iface.AcceptStreamTube( + tube_id, + telepathy.SOCKET_ADDRESS_TYPE_IPV4, + telepathy.SOCKET_ACCESS_CONTROL_LOCALHOST, 0, + utf8_strings=True) logging.error('Accepted stream tube: listening address is %r', addr) # SOCKET_ADDRESS_TYPE_IPV4 is defined to have addresses of type '(sq)' assert isinstance(addr, dbus.Struct) @@ -213,10 +214,10 @@ class JournalShare(activity.Activity): chan = self.shared_activity.telepathy_tubes_chan iface = chan[telepathy.CHANNEL_TYPE_TUBES] self._fileserver_tube_id = iface.OfferStreamTube( - JOURNAL_STREAM_SERVICE, {}, - telepathy.SOCKET_ADDRESS_TYPE_IPV4, - ('127.0.0.1', dbus.UInt16(self.port)), - telepathy.SOCKET_ACCESS_CONTROL_LOCALHOST, 0) + JOURNAL_STREAM_SERVICE, {}, + telepathy.SOCKET_ADDRESS_TYPE_IPV4, + ('127.0.0.1', dbus.UInt16(self.port)), + telepathy.SOCKET_ACCESS_CONTROL_LOCALHOST, 0) def watch_for_tubes(self): """Watch for new tubes.""" @@ -226,8 +227,8 @@ class JournalShare(activity.Activity): tubes_chan = self.shared_activity.telepathy_tubes_chan - tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal('NewTube', - self._new_tube_cb) + tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal( + 'NewTube', self._new_tube_cb) tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes( reply_handler=self._list_tubes_reply_cb, error_handler=self._list_tubes_error_cb) @@ -398,7 +399,7 @@ class JournalManager(GObject.GObject): if preview_content is not None and preview_content != '': new_dsobject.metadata['preview'] = \ - dbus.ByteArray(preview_content) + dbus.ByteArray(preview_content) datastore.write(new_dsobject) if self._shared_items == ['*']: # mark as favorite @@ -441,6 +442,6 @@ class JournalManager(GObject.GObject): utils.package_ds_object(dsobj, self._instance_path) results.append({'title': title, 'desc': desc, 'comment': comment, - 'id': object_id}) + 'id': object_id}) logging.error(results) return json.dumps(results) diff --git a/downloadmanager.py b/downloadmanager.py index 7cc9418..9e23acc 100644 --- a/downloadmanager.py +++ b/downloadmanager.py @@ -42,9 +42,11 @@ _dest_to_window = {} SPACE_THRESHOLD = 52428800 + def format_float(f): return "%0.2f" % f + def can_quit(): return len(_active_downloads) == 0 @@ -83,9 +85,10 @@ class Download(object): if not os.path.exists(self.temp_path): os.makedirs(self.temp_path) - fd, self._dest_path = tempfile.mkstemp(dir=self.temp_path, - suffix=download.get_suggested_filename(), - prefix='tmp') + fd, self._dest_path = tempfile.mkstemp( + dir=self.temp_path, + suffix=download.get_suggested_filename(), + prefix='tmp') os.close(fd) logging.debug('Download destination path: %s' % self._dest_path) @@ -117,13 +120,12 @@ class Download(object): total_size_mb = total_size / 1024.0 ** 2 free_space_mb = self._free_available_space( - path=self.temp_path) - SPACE_THRESHOLD \ - / 1024.0 ** 2 + path=self.temp_path) - SPACE_THRESHOLD / 1024.0 ** 2 filename = self._download.get_suggested_filename() self._canceled_alert.props.msg = \ - _('Download "%{filename}" requires %{total_size_in_mb}' \ - ' MB of free space, only %{free_space_in_mb} MB' \ - ' is available' % \ + _('Download "%{filename}" requires %{total_size_in_mb}' + ' MB of free space, only %{free_space_in_mb} MB' + ' is available' % {'filename': filename, 'total_size_in_mb': format_float(total_size_mb), 'free_space_in_mb': format_float(free_space_mb)}) @@ -199,7 +201,7 @@ class Download(object): def __error_cb(self, download, err_code, err_detail, reason): logging.debug('Error downloading URI code %s, detail %s: %s' - % (err_code, err_detail, reason)) + % (err_code, err_detail, reason)) def __internal_save_cb(self): logging.debug('Object saved succesfully to the datastore.') @@ -283,7 +285,7 @@ class Download(object): self.dl_jobject.metadata['buddies'] = '' self.dl_jobject.metadata['preview'] = '' self.dl_jobject.metadata['icon-color'] = \ - profile.get_color().to_string() + profile.get_color().to_string() self.dl_jobject.metadata['mime_type'] = '' self.dl_jobject.file_path = '' datastore.write(self.dl_jobject) @@ -296,8 +298,8 @@ class Download(object): arg0=self.dl_jobject.object_id) def __datastore_deleted_cb(self, uid): - logging.debug('Downloaded entry has been deleted' \ - ' from the datastore: %r', uid) + logging.debug('Downloaded entry has been deleted' + ' from the datastore: %r', uid) global _active_downloads if self in _active_downloads: self.cancel() diff --git a/filepicker.py b/filepicker.py index 4ea9354..b32742e 100644 --- a/filepicker.py +++ b/filepicker.py @@ -53,8 +53,9 @@ class FilePicker(ObjectChooser): logging.debug('FilePicker.show: %r', jobject) if jobject and jobject.file_path: - tmp_dir = tempfile.mkdtemp(prefix='', \ - dir=os.path.join(get_activity_root(), 'tmp')) + tmp_dir = tempfile.mkdtemp( + prefix='', + dir=os.path.join(get_activity_root(), 'tmp')) _file = utils.package_ds_object(jobject, tmp_dir) @@ -56,7 +56,7 @@ class JournalHTTPRequestHandler(SimpleHTTPRequestHandler): file_content = query.get('journal_item')[0] # save to the journal zipped_file_path = os.path.join(self.activity_root, - 'instance', 'received.journal') + 'instance', 'received.journal') f = open(zipped_file_path, 'wb') try: f.write(file_content) @@ -64,12 +64,12 @@ class JournalHTTPRequestHandler(SimpleHTTPRequestHandler): f.close() metadata, preview_data, file_path = \ - utils.unpackage_ds_object(zipped_file_path, None) + utils.unpackage_ds_object(zipped_file_path, None) logging.error('METADATA %s', metadata) - GLib.idle_add(self.jm.create_object, file_path, - metadata, preview_data) + GLib.idle_add(self.jm.create_object, file_path, metadata, + preview_data) #redirect to index.html page self.send_response(301) @@ -117,7 +117,7 @@ class JournalHTTPRequestHandler(SimpleHTTPRequestHandler): self.send_header("Content-type", mime_type) if file_name is not None: self.send_header("Content-Disposition", - "inline; filename='%s'" % file_name) + "inline; filename='%s'" % file_name) self.end_headers() @@ -160,7 +160,8 @@ class JournalHTTPServer(BaseHTTPServer.HTTPServer): def run_server(activity_path, activity_root, jm, port): # init the journal manager before start the thread from threading import Thread - httpd = JournalHTTPServer(("", port), + httpd = JournalHTTPServer( + ("", port), lambda *args: JournalHTTPRequestHandler(activity_path, activity_root, jm, *args)) server = Thread(target=httpd.serve_forever) |