Skip to content

Python 3: define basestring, use bytes.decode() #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Python 3: define basestring, use bytes.decode() #670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44fe4e
Python 3: define basestring, use sbytes.decode()
Oct 2, 2016
8280e35
Attitude.__str__()
Oct 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions dronekit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@
import collections
from pymavlink.dialects.v10 import ardupilotmega


try:
basestring # Python 2
except NameError: # Python 3
basestring = (str, bytes)

class APIException(Exception):
"""
Base class for DroneKit related exceptions.
Expand Down Expand Up @@ -87,7 +91,8 @@ def __init__(self, pitch, yaw, roll):
self.roll = roll

def __str__(self):
return "Attitude:pitch=%s,yaw=%s,roll=%s" % (self.pitch, self.yaw, self.roll)
fmt = '{}:pitch={pitch},yaw={yaw},roll={roll}'
return fmt.format(self.__class__.__name__, **vars(self))


class LocationGlobal(object):
Expand Down Expand Up @@ -2822,7 +2827,7 @@ def connect(ip,

@vehicle.on_message('STATUSTEXT')
def listener(self, name, m):
status_printer(re.sub(r'(^|\n)', '>>> ', m.text.rstrip()))
status_printer(re.sub(r'(^|\n)', '>>> ', m.text.decode('utf-8').rstrip()))

if _initialize:
vehicle.initialize(rate=rate, heartbeat_timeout=heartbeat_timeout)
Expand Down