Benjamin Smith avatar Benjamin Smith committed 2e14827

Fix some pep8 badness that I introduced when resolving conflicts

Comments (0)

Files changed (2)

     :keyword sock: An open socket to the STOMP server.
     def __init__(self, sock=None):
         self.command = None
         self.headers = {}
 class NotConnectedError(Exception):
     """No longer connected to the STOMP server."""
 class ConnectionError(socket.error):
     """Couldn't connect to the STOMP server."""
         self._send_command("COMMIT", conf)
     def abort(self, conf=None):
         """Abort transaction.
         self._send_command("ABORT", conf)
     def unsubscribe(self, conf=None):
         """Unsubscribe from a given destination
         frame = self.frame.send_frame(frame.as_string())
         return frame
     def _send_command(self, command, conf=None, extra=None, **kwargs):
         conf = conf or {}
         extra = extra or {}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.