Fix None is a reserved keyword in Python 3

Docs/python_api.md

@@ -179,7 +179,7 @@
 
 ## `carla.ColorConverter`
 
-- `None`
+- `Raw`
 - `Depth`
 - `LogarithmicDepth`
 - `CityScapesPalette`

PythonAPI/manual_control.py

@@ -376,11 +376,11 @@ class CameraManager(object):
             carla.Transform(carla.Location(x=-5.5, z=2.8), carla.Rotation(pitch=-15))]
         self._transform_index = 1
         self._sensors = [
-            ['sensor.camera.rgb', cc.None, 'Camera RGB'],
-            ['sensor.camera.depth', cc.None, 'Camera Depth (Raw)'],
+            ['sensor.camera.rgb', cc.Raw, 'Camera RGB'],
+            ['sensor.camera.depth', cc.Raw, 'Camera Depth (Raw)'],
             ['sensor.camera.depth', cc.Depth, 'Camera Depth (Gray Scale)'],
             ['sensor.camera.depth', cc.LogarithmicDepth, 'Camera Depth (Logarithmic Gray Scale)'],
-            ['sensor.camera.semantic_segmentation', cc.None, 'Camera Semantic Segmentation (Raw)'],
+            ['sensor.camera.semantic_segmentation', cc.Raw, 'Camera Semantic Segmentation (Raw)'],
             ['sensor.camera.semantic_segmentation', cc.CityScapesPalette, 'Camera Semantic Segmentation (CityScapes Palette)']]
         world = self._parent.get_world()
         bp_library = world.get_blueprint_library()

PythonAPI/source/libcarla/SensorData.cpp

@@ -49,7 +49,7 @@ namespace data {
 } // namespace carla
 
 enum class EColorConverter {
-  None,
+  Raw,
   Depth,
   LogarithmicDepth,
   CityScapesPalette
@@ -82,7 +82,7 @@ static void ConvertImage(T &self, EColorConverter cc) {
     case EColorConverter::CityScapesPalette:
       ImageConverter::ConvertInPlace(view, ColorConverter::CityScapesPalette());
       break;
-    case EColorConverter::None:
+    case EColorConverter::Raw:
       break; // ignore.
     default:
       throw std::invalid_argument("invalid color converter!");
@@ -95,7 +95,7 @@ static std::string SaveImageToDisk(T &self, std::string path, EColorConverter cc
   using namespace carla::image;
   auto view = ImageView::MakeView(self);
   switch (cc) {
-    case EColorConverter::None:
+    case EColorConverter::Raw:
       return ImageIO::WriteView(
           std::move(path),
           view);
@@ -135,7 +135,7 @@ void export_sensor_data() {
   ;
 
   enum_<EColorConverter>("ColorConverter")
-    .value("None", EColorConverter::None)
+    .value("Raw", EColorConverter::Raw)
     .value("Depth", EColorConverter::Depth)
     .value("LogarithmicDepth", EColorConverter::LogarithmicDepth)
     .value("CityScapesPalette", EColorConverter::CityScapesPalette)
@@ -147,7 +147,7 @@ void export_sensor_data() {
     .add_property("fov", &csd::Image::GetFOVAngle)
     .add_property("raw_data", &GetRawDataAsBuffer<csd::Image>)
     .def("convert", &ConvertImage<csd::Image>, (arg("color_converter")))
-    .def("save_to_disk", &SaveImageToDisk<csd::Image>, (arg("path"), arg("color_converter")=EColorConverter::None))
+    .def("save_to_disk", &SaveImageToDisk<csd::Image>, (arg("path"), arg("color_converter")=EColorConverter::Raw))
     .def("__len__", &csd::Image::size)
     .def("__iter__", iterator<csd::Image>())
     .def("__getitem__", +[](const csd::Image &self, size_t pos) -> csd::Color {