Merge remote-tracking branch 'upstream/master' into zope4py3

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testRestrictedPythonSecurity.py

@@ -853,6 +853,62 @@ class TestRestrictedPythonSecurity(ERP5TypeTestCase):
         return ip_interface(u'2a01:cb14:818:0:7312:e251:f251:ffbe').with_prefixlen
         ''')
 
+  def testPytzNonExistentTimeError(self):
+    """
+      Test if we can import NonExistentTimeError from the
+      pytz package. This is important to catch exceptions
+      which can be raised by pandas tz_localize, see:
+
+      https://pandas.pydata.org/pandas-docs/version/2.0.3/reference/api/pandas.Series.tz_localize.html
+
+      Test data/structure taken from
+
+      https://github.com/pandas-dev/pandas/blob/c1f673b71d2a4a7d11cb05d4803f279914c543d4/pandas/tests/scalar/timestamp/test_timezones.py#L124-L141
+    """
+    self.createAndRunScript(
+      '''
+      import pandas as pd
+      import pytz
+      ts = pd.Timestamp("2015-03-08 02:00")
+      try:
+        ts.tz_localize("US/Eastern")
+      except pytz.NonExistentTimeError:
+        return "not existent time error"
+      ''',
+      expected="not existent time error"
+    )
+
+  def testPytzExceptions(self):
+    """
+      Test that all pytz exceptions can be used in restricted python.
+      All of them are very simple classes that can't harm the system.
+    """
+    self.createAndRunScript(
+      '''
+      import pytz
+      c = 0
+      for e in 'UnknownTimeZoneError InvalidTimeError AmbiguousTimeError NonExistentTimeError'.split():
+        getattr(pytz, e)
+        c += 1
+      return c
+      ''',
+      expected=4,
+    )
+
+  def testPytzProhibitedObjects(self):
+    """
+      Test that prohibited objects of the pytz module can't be
+      used within restricted python.
+    """
+    self.assertRaises(
+      ZopeGuardsUnauthorized,
+      self.createAndRunScript,
+      '''
+      import pytz
+      pytz.timezone
+      '''
+    )
+
 
 def add_tests(suite, module):
   if hasattr(module, 'test_suite'):

bt5/erp5_l10n_ja/bt/dependency_list

+erp5_base
\ No newline at end of file

bt5/erp5_officejs_drone_simulator/PathTemplateItem/web_page_module/drone_simulator_dronelogfollower_js.js

@@ -13,6 +13,11 @@ var DroneLogAPI = /** @class */ (function () {
     this._drone_info = drone_info;
     this._flight_parameters = flight_parameters;
   }
+  Object.defineProperty(DroneLogAPI.prototype, "isCollidable", {
+    get: function () { return false; },
+    enumerable: true,
+    configurable: true
+  });
   /*
   ** Function called at start phase of the drone, just before onStart AI script
   */

bt5/erp5_officejs_drone_simulator/PathTemplateItem/web_page_module/drone_simulator_dronelogfollower_js.xml

@@ -246,7 +246,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1010.13157.33937.23381</string> </value>
+                      <value> <string>1010.13501.40623.51950</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -266,7 +266,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1691051883.97</float>
+                              <float>1691588429.76</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_officejs_drone_simulator/PathTemplateItem/web_page_module/drone_simulator_fixedwingdrone_js.js

@@ -32,6 +32,11 @@ var FixedWingDroneAPI = /** @class */ (function () {
     this._loiter_mode = false;
     this._drone_dict_list = [];
   }
+  Object.defineProperty(FixedWingDroneAPI.prototype, "isCollidable", {
+    get: function () { return true; },
+    enumerable: true,
+    configurable: true
+  });
   /*
   ** Function called on start phase of the drone, just before onStart AI script
   */
@@ -393,9 +398,7 @@ var FixedWingDroneAPI = /** @class */ (function () {
     }
     var processed_coordinates =
       this._mapManager.convertToLocalCoordinates(lat, lon, z);
-    if (processed_coordinates.z > this._map_dict.start_AMSL) {
     processed_coordinates.z -= this._map_dict.start_AMSL;
-    }
     //this._last_altitude_point_reached = -1;
     //this.takeoff_path = [];
     return processed_coordinates;

bt5/erp5_officejs_drone_simulator/PathTemplateItem/web_page_module/drone_simulator_fixedwingdrone_js.xml

@@ -240,7 +240,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1010.13155.61424.54442</string> </value>
+                      <value> <string>1010.22099.47894.60006</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -260,7 +260,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1691051762.91</float>
+                              <float>1691588633.42</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_officejs_drone_simulator/PathTemplateItem/web_page_module/drone_simulator_logic_js.js

@@ -37,7 +37,7 @@ var DroneManager = /** @class */ (function () {
     // Create the control mesh
     this._controlMesh = BABYLON.Mesh.CreateBox(
       "droneControl_" + id,
-      0.01,
+      1.55, // 155 cm long wingspan
       this._scene
     );
     this._controlMesh.isVisible = false;
@@ -421,7 +421,7 @@ var MapManager = /** @class */ (function () {
                                        [map_dict.min_lat, map_dict.max_lon]),
       max_height = this.latLonDistance([map_dict.min_lat, map_dict.min_lon],
                                       [map_dict.max_lat, map_dict.min_lon]),
-      map_size = Math.ceil(Math.max(max_width, max_height)) * 0.6;
+      map_size = Math.ceil(Math.max(max_width, max_height));
     this.map_info = {
       "depth": map_size,
       "height": map_dict.height,
@@ -622,13 +622,14 @@ var GameManager = /** @class */ (function () {
     this._flight_log[drone._id].push(error.stack);
   };
 
-  GameManager.prototype._checkDroneRules = function (drone) {
-    //TODO move this to API methods.
-    //each type of drone should define its rules
-    if (drone.getCurrentPosition()) {
-      return drone.getCurrentPosition().z > 1;
+  GameManager.prototype._checkCollision = function (drone, other) {
+    if (drone.colliderMesh && other.colliderMesh &&
+        drone.colliderMesh.intersectsMesh(other.colliderMesh, false)) {
+      drone._internal_crash(new Error('Drone ' + drone.id +
+                            ' touched drone ' + other.id + '.'));
+      other._internal_crash(new Error('Drone ' + drone.id +
+                            ' touched drone ' + other.id + '.'));
     }
-    return false;
   };
 
   GameManager.prototype._update = function (delta_time, fullscreen) {
@@ -664,11 +665,19 @@ var GameManager = /** @class */ (function () {
     this._droneList.forEach(function (drone) {
       queue.push(function () {
         drone._tick += 1;
-        if (_this._checkDroneRules(drone)) {
-          return drone.internal_update(delta_time);
+        if (drone._API.isCollidable && drone.can_play) {
+          if (drone.getCurrentPosition().z <= 0) {
+            drone._internal_crash(new Error('Drone ' + drone.id +
+                                            ' touched the floor.'));
+          } else {
+            _this._droneList.forEach(function (other) {
+              if (other.can_play && drone.id !== other.id) {
+                _this._checkCollision(drone, other);
               }
-        //TODO error must be defined by the api?
-        drone._internal_crash('Drone touched the floor');
+            });
+          }
+        }
+        return drone.internal_update(delta_time);
       });
     });
 

bt5/erp5_officejs_drone_simulator/PathTemplateItem/web_page_module/drone_simulator_logic_js.xml

@@ -240,7 +240,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1010.13183.29224.8874</string> </value>
+                      <value> <string>1010.42341.16308.11025</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -260,7 +260,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1691053915.45</float>
+                              <float>1692802878.6</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_officejs_drone_simulator_test/PathTemplateItem/web_page_module/test_drone_simulator_flight_js.js

@@ -63,7 +63,7 @@
       '  me.setTargetCoordinates(\n' +
       '    me.initialPosition.x + 0.01,\n' +
       '    me.initialPosition.y,\n' +
-      '    me.initialPosition.z\n' +
+      '    me.getAltitudeAbs()\n' +
       '  );\n' +
       '};\n' +
       '\n' +

bt5/erp5_officejs_drone_simulator_test/PathTemplateItem/web_page_module/test_drone_simulator_flight_js.xml

@@ -246,7 +246,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1010.10621.5765.11161</string> </value>
+                      <value> <string>1010.12196.1891.61832</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -266,7 +266,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1690900659.22</float>
+                              <float>1691485888.5</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Node%20Module.xml

@@ -76,12 +76,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>

product/CMFActivity/Activity/SQLBase.py

@@ -1048,7 +1048,7 @@ CREATE TABLE %s (
       " date = DATE_ADD(UTC_TIMESTAMP(6), INTERVAL %s SECOND)"
       "%s WHERE uid IN (%s)" % (
         self.sql_table, delay,
-        ", priority = priority + 1, retry = retry + 1" if retry else "",
+        ", retry = retry + 1" if retry else "",
         ",".join(map(str, uid_list))))
 
   def finalizeMessageExecution(self, activity_tool, message_list,

product/ERP5Type/patches/Restricted.py

@@ -584,6 +584,11 @@ else:
   allow_full_write(pd.MultiIndex)
   allow_full_write(pd.Index)
 
+# pytz exceptions are sometimes needed when using pandas
+# see https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.Series.tz_localize.html
+for e in 'UnknownTimeZoneError InvalidTimeError AmbiguousTimeError NonExistentTimeError'.split():
+  ModuleSecurityInfo('pytz').declarePublic(e)
+
 import ipaddress
 allow_module('ipaddress')
 allow_type(ipaddress.IPv4Address)

product/ERP5Type/patches/sqlvar.py

@@ -74,6 +74,8 @@ if IS_ZOPE2: # BBB Zope2
         elif t=='nb' and not v:
             t = 'empty string'
         else:
+            if v is None:
+                return 'null'
             v = md.getitem('sql_quote__',0)(
                 v if isinstance(v, basestring) else str(v))
             #if find(v,"\'") >= 0: v=join(split(v,"\'"),"''")