Skip to content

Commit 2275e98

Browse files
committed
git subrepo pull (merge) uno
subrepo: subdir: "uno" merged: "8e65768e" upstream: origin: "https://github.com/prrvchr/uno.git" branch: "main" commit: "8e65768e" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596"
1 parent 7eef4e5 commit 2275e98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+540
-279
lines changed

uno/.gitrepo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/prrvchr/uno.git
88
branch = main
9-
commit = 52436ae4ff61b0f9f68deacd3d659064622fdba2
10-
parent = 0443efed0f477f0466f0f5151ed544f215c127f2
9+
commit = 8e65768e1a5fb4ccbf8dd9f73dd5f46c6d01df13
10+
parent = 7eef4e5f9158eec0e9f299c9825fa55035728b4d
1111
method = merge
1212
cmdver = 0.4.3

uno/lib/java/helper/UnoHelper.java

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import com.sun.star.resource.XStringResourceResolver;
3333
import com.sun.star.sdbc.SQLException;
3434
import com.sun.star.sdbc.XRow;
35-
import com.sun.star.uno.Any;
3635
import com.sun.star.uno.AnyConverter;
3736
import com.sun.star.uno.Exception;
3837
import com.sun.star.uno.RuntimeException;
@@ -366,19 +365,19 @@ public static WrappedTargetException getWrappedException(Exception e)
366365
return exception;
367366
}
368367

369-
public static java.sql.SQLException getSQLException(java.lang.Exception e)
368+
public static java.sql.SQLException getSQLException(java.lang.Throwable e)
370369
{
371-
return new java.sql.SQLException(e.getMessage(), e);
370+
return new java.sql.SQLException(e.getLocalizedMessage(), e);
372371
}
373372

374373
public static SQLException getSQLException(java.sql.SQLException e)
375374
{
376-
return new SQLException(e.getMessage());
375+
return getUnoSQLException(e.getLocalizedMessage());
377376
}
378377

379378
public static SQLException getSQLException(Exception e, XInterface component)
380379
{
381-
SQLException exception = new SQLException(e.getMessage());
380+
SQLException exception = getUnoSQLException(e.getMessage());
382381
exception.Context = component;
383382
return exception;
384383
}
@@ -387,25 +386,36 @@ public static SQLException getSQLException(java.sql.SQLException e, XInterface c
387386
{
388387
SQLException exception = null;
389388
if (e != null) {
390-
exception = new SQLException(e.getMessage());
389+
exception = getUnoSQLException(e.getLocalizedMessage());
391390
exception.Context = component;
392-
exception.SQLState = e.getSQLState();
391+
String state = e.getSQLState();
392+
if (state != null) {
393+
exception.SQLState = state;
394+
}
393395
exception.ErrorCode = e.getErrorCode();
394396
SQLException ex = getNextSQLException(e.getNextException(), component);
395-
exception.NextException = (ex == null) ? Any.VOID : ex;
397+
if (ex != null) {
398+
exception.NextException = ex;
399+
}
396400
}
397401
return exception;
398402
}
399403

404+
private static SQLException getUnoSQLException(String msg)
405+
{
406+
return msg != null ? new SQLException(msg) : new SQLException();
407+
}
408+
400409
public static SQLException getSQLException(java.lang.Exception e,
401410
XInterface component)
402411
{
403-
SQLException exception = new SQLException(e.getMessage());
412+
SQLException exception = getUnoSQLException(e.getMessage());
404413
exception.Context = component;
405414
return exception;
406415
}
407416

408-
private static SQLException getNextSQLException(java.sql.SQLException e, XInterface component)
417+
private static SQLException getNextSQLException(java.sql.SQLException e,
418+
XInterface component)
409419
{
410420
SQLException exception = null;
411421
if (e != null) {
@@ -931,4 +941,28 @@ public static boolean getConfigurationOption(XHierarchicalNameAccess config,
931941
return option;
932942
}
933943

944+
public static String getCaller()
945+
{
946+
StackWalker stackWalker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
947+
StackWalker.StackFrame frame = stackWalker.walk(stream1 -> stream1.skip(2)
948+
.findFirst()
949+
.orElse(null));
950+
if (frame == null) {
951+
return "caller: null";
952+
}
953+
return String.format("caller: %s#%s, %s",
954+
frame.getClassName(),
955+
frame.getMethodName(),
956+
frame.getLineNumber());
957+
}
958+
959+
public static void printStackTrace()
960+
{
961+
Thread thread = Thread.currentThread();
962+
StackTraceElement[] stackTrace = thread.getStackTrace();
963+
for (int i = 1; i < stackTrace.length; i++) {
964+
System.out.println(stackTrace[i].getClassName() + " " + stackTrace[i].getMethodName() + " " + stackTrace[i].getLineNumber());
965+
}
966+
}
967+
934968
}

uno/lib/python/requests-2.31.0.dist-info/RECORD

Lines changed: 0 additions & 23 deletions
This file was deleted.

uno/lib/python/requests-2.31.0.dist-info/METADATA renamed to uno/lib/python/requests-2.32.3.dist-info/METADATA

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
Metadata-Version: 2.1
22
Name: requests
3-
Version: 2.31.0
3+
Version: 2.32.3
44
Summary: Python HTTP for Humans.
55
Home-page: https://requests.readthedocs.io
66
Author: Kenneth Reitz
77
Author-email: me@kennethreitz.org
8-
License: Apache 2.0
8+
License: Apache-2.0
99
Project-URL: Documentation, https://requests.readthedocs.io
1010
Project-URL: Source, https://github.com/psf/requests
11-
Platform: UNKNOWN
1211
Classifier: Development Status :: 5 - Production/Stable
1312
Classifier: Environment :: Web Environment
1413
Classifier: Intended Audience :: Developers
@@ -17,28 +16,28 @@ Classifier: Natural Language :: English
1716
Classifier: Operating System :: OS Independent
1817
Classifier: Programming Language :: Python
1918
Classifier: Programming Language :: Python :: 3
20-
Classifier: Programming Language :: Python :: 3.7
2119
Classifier: Programming Language :: Python :: 3.8
2220
Classifier: Programming Language :: Python :: 3.9
2321
Classifier: Programming Language :: Python :: 3.10
2422
Classifier: Programming Language :: Python :: 3.11
23+
Classifier: Programming Language :: Python :: 3.12
2524
Classifier: Programming Language :: Python :: 3 :: Only
2625
Classifier: Programming Language :: Python :: Implementation :: CPython
2726
Classifier: Programming Language :: Python :: Implementation :: PyPy
2827
Classifier: Topic :: Internet :: WWW/HTTP
2928
Classifier: Topic :: Software Development :: Libraries
30-
Requires-Python: >=3.7
29+
Requires-Python: >=3.8
3130
Description-Content-Type: text/markdown
3231
License-File: LICENSE
33-
Requires-Dist: charset-normalizer (<4,>=2)
34-
Requires-Dist: idna (<4,>=2.5)
35-
Requires-Dist: urllib3 (<3,>=1.21.1)
36-
Requires-Dist: certifi (>=2017.4.17)
32+
Requires-Dist: charset-normalizer <4,>=2
33+
Requires-Dist: idna <4,>=2.5
34+
Requires-Dist: urllib3 <3,>=1.21.1
35+
Requires-Dist: certifi >=2017.4.17
3736
Provides-Extra: security
3837
Provides-Extra: socks
39-
Requires-Dist: PySocks (!=1.5.7,>=1.5.6) ; extra == 'socks'
38+
Requires-Dist: PySocks !=1.5.7,>=1.5.6 ; extra == 'socks'
4039
Provides-Extra: use_chardet_on_py3
41-
Requires-Dist: chardet (<6,>=3.0.2) ; extra == 'use_chardet_on_py3'
40+
Requires-Dist: chardet <6,>=3.0.2 ; extra == 'use_chardet_on_py3'
4241

4342
# Requests
4443

@@ -63,7 +62,7 @@ Requests allows you to send HTTP/1.1 requests extremely easily. There’s no nee
6362

6463
Requests is one of the most downloaded Python packages today, pulling in around `30M downloads / week`— according to GitHub, Requests is currently [depended upon](https://github.com/psf/requests/network/dependents?package_id=UGFja2FnZS01NzA4OTExNg%3D%3D) by `1,000,000+` repositories. You may certainly put your trust in this code.
6564

66-
[![Downloads](https://pepy.tech/badge/requests/month)](https://pepy.tech/project/requests)
65+
[![Downloads](https://static.pepy.tech/badge/requests/month)](https://pepy.tech/project/requests)
6766
[![Supported Versions](https://img.shields.io/pypi/pyversions/requests.svg)](https://pypi.org/project/requests)
6867
[![Contributors](https://img.shields.io/github/contributors/psf/requests.svg)](https://github.com/psf/requests/graphs/contributors)
6968

@@ -75,7 +74,7 @@ Requests is available on PyPI:
7574
$ python -m pip install requests
7675
```
7776

78-
Requests officially supports Python 3.7+.
77+
Requests officially supports Python 3.8+.
7978

8079
## Supported Features & Best–Practices
8180

@@ -118,5 +117,3 @@ git config --global fetch.fsck.badTimezone ignore
118117
---
119118

120119
[![Kenneth Reitz](https://raw.githubusercontent.com/psf/requests/main/ext/kr.png)](https://kennethreitz.org) [![Python Software Foundation](https://raw.githubusercontent.com/psf/requests/main/ext/psf.png)](https://www.python.org/psf)
121-
122-
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
requests/__init__.py,sha256=4xaAERmPDIBPsa2PsjpU9r06yooK-2mZKHTZAhWRWts,5072
2+
requests/__version__.py,sha256=FVfglgZmNQnmYPXpOohDU58F5EUb_-VnSTaAesS187g,435
3+
requests/_internal_utils.py,sha256=nMQymr4hs32TqVo5AbCrmcJEhvPUh7xXlluyqwslLiQ,1495
4+
requests/adapters.py,sha256=KIcecscqam6reOCXRl4DwP4jX8Jcl8sd57ft17KR2cQ,27451
5+
requests/api.py,sha256=_Zb9Oa7tzVIizTKwFrPjDEY9ejtm_OnSRERnADxGsQs,6449
6+
requests/auth.py,sha256=kF75tqnLctZ9Mf_hm9TZIj4cQWnN5uxRz8oWsx5wmR0,10186
7+
requests/certs.py,sha256=Z9Sb410Anv6jUFTyss0jFFhU6xst8ctELqfy8Ev23gw,429
8+
requests/compat.py,sha256=C5w_DPLSurXPgcdWU78fora0APmbYkX2G89QvH5xzPA,1817
9+
requests/cookies.py,sha256=bNi-iqEj4NPZ00-ob-rHvzkvObzN3lEpgw3g6paS3Xw,18590
10+
requests/exceptions.py,sha256=jJPS1UWATs86ShVUaLorTiJb1SaGuoNEWgICJep-VkY,4260
11+
requests/help.py,sha256=gPX5d_H7Xd88aDABejhqGgl9B1VFRTt5BmiYvL3PzIQ,3875
12+
requests/hooks.py,sha256=CiuysiHA39V5UfcCBXFIx83IrDpuwfN9RcTUgv28ftQ,733
13+
requests/models.py,sha256=k42roXzC8u_OagAPQi9U4MkfO7i4r2FdaqvMqstPehc,35418
14+
requests/packages.py,sha256=_g0gZ681UyAlKHRjH6kanbaoxx2eAb6qzcXiODyTIoc,904
15+
requests/sessions.py,sha256=ykTI8UWGSltOfH07HKollH7kTBGw4WhiBVaQGmckTw4,30495
16+
requests/status_codes.py,sha256=iJUAeA25baTdw-6PfD0eF4qhpINDJRJI-yaMqxs4LEI,4322
17+
requests/structures.py,sha256=-IbmhVz06S-5aPSZuUthZ6-6D9XOjRuTXHOabY041XM,2912
18+
requests/utils.py,sha256=HiQC6Nq_Da3ktaMiFzQkh-dCk3iQHHKEsYS5kDc-8Cw,33619
19+
requests-2.32.3.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
20+
requests-2.32.3.dist-info/METADATA,sha256=ZY7oRUweLnb7jCEnEW9hFWs7IpQbNVnAA4ncpwA4WBo,4610
21+
requests-2.32.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
22+
requests-2.32.3.dist-info/top_level.txt,sha256=fMSVmHfb5rbGOo6xv-O_tUX6j-WyixssE-SnwcDRxNQ,9
23+
requests-2.32.3.dist-info/RECORD,,
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Wheel-Version: 1.0
2-
Generator: bdist_wheel (0.41.1)
2+
Generator: bdist_wheel (0.43.0)
33
Root-Is-Purelib: true
44
Tag: py3-none-any
55

uno/lib/python/requests/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
8383
# charset_normalizer >= 2.0.0 < 4.0.0
8484
assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
8585
else:
86-
raise Exception("You need either charset_normalizer or chardet installed")
86+
warnings.warn(
87+
"Unable to find acceptable character detection dependency "
88+
"(chardet or charset_normalizer).",
89+
RequestsDependencyWarning,
90+
)
8791

8892

8993
def _check_cryptography(cryptography_version):

uno/lib/python/requests/__version__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
__title__ = "requests"
66
__description__ = "Python HTTP for Humans."
77
__url__ = "https://requests.readthedocs.io"
8-
__version__ = "2.31.0"
9-
__build__ = 0x023100
8+
__version__ = "2.32.3"
9+
__build__ = 0x023203
1010
__author__ = "Kenneth Reitz"
1111
__author_email__ = "me@kennethreitz.org"
12-
__license__ = "Apache 2.0"
12+
__license__ = "Apache-2.0"
1313
__copyright__ = "Copyright Kenneth Reitz"
1414
__cake__ = "\u2728 \U0001f370 \u2728"

0 commit comments

Comments
 (0)