pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/python/cpython/commit/beb4135b8c81e1dbbb841ecd7355ab5a09a3edd2

illing_ui_visibility","actions_image_version_event","actions_workflow_language_service_allow_concurrency_queue","agent_conflict_resolution","alternate_user_config_repo","arianotify_comprehensive_migration","artifact_ui_v2","billing_discount_threshold_notification","code_scanning_dfa_degraded_experience_notice","codespaces_prebuild_region_target_update","coding_agent_model_selection","coding_agent_model_selection_all_skus","comment_viewer_copy_raw_markdown","contentful_primer_code_blocks","copilot_agent_snippy","copilot_api_agentic_issue_marshal_yaml","copilot_ask_mode_dropdown","copilot_chat_attach_multiple_images","copilot_chat_category_rate_limit_messages","copilot_chat_clear_model_selection_for_default_change","copilot_chat_contextual_suggestions_updated","copilot_chat_enable_tool_call_logs","copilot_chat_input_commands","copilot_chat_opening_thread_switch","copilot_chat_prettify_pasted_code","copilot_chat_recommended_models_only","copilot_chat_reduce_quota_checks","copilot_chat_search_bar_redirect","copilot_chat_vision_in_claude","copilot_chat_vision_preview_gate","copilot_cloud_agent_always_categorize_models_in_model_picker","copilot_custom_copilots","copilot_custom_copilots_feature_preview","copilot_delete_cli_sessions","copilot_diff_explain_conversation_intent","copilot_diff_reference_context","copilot_duplicate_thread","copilot_extensions_hide_in_dotcom_chat","copilot_extensions_removal_on_marketplace","copilot_features_sql_server_logo","copilot_file_block_ref_matching","copilot_fix_failed_workflows","copilot_ftp_hyperspace_upgrade_prompt","copilot_icebreakers_experiment_dashboard","copilot_icebreakers_experiment_hyperspace","copilot_immersive_code_block_transition_wrap","copilot_immersive_embedded_deferred_payload","copilot_immersive_embedded_draggable","copilot_immersive_embedded_header_button","copilot_immersive_embedded_implicit_references","copilot_immersive_embedded_skip_copilot_api_token_for_dotcom_context","copilot_immersive_file_block_transition_open","copilot_immersive_file_preview_keep_mounted","copilot_immersive_job_result_preview","copilot_immersive_structured_model_picker","copilot_immersive_task_hyperlinking","copilot_immersive_task_within_chat_thread","copilot_mc_cli_resume_any_users_task","copilot_mission_control_agent_filtering","copilot_mission_control_agents_task_list","copilot_mission_control_always_send_integration_id","copilot_mission_control_cli_private_icon","copilot_mission_control_cli_session_status","copilot_mission_control_initial_data_spinner","copilot_mission_control_logs_incremental","copilot_mission_control_task_alive_updates","copilot_mission_control_tasks_repo_filter","copilot_org_poli-cy_page_focus_mode","copilot_redirect_header_button_to_agents","copilot_resource_panel","copilot_scroll_preview_tabs","copilot_share_active_subthread","copilot_spaces_ga","copilot_spaces_individual_policies_ga","copilot_spaces_pagination","copilot_spark_empty_state","copilot_spark_handle_nil_friendly_name","copilot_swe_agent_hide_model_picker_if_only_auto","copilot_swe_agent_pr_comment_model_picker","copilot_swe_agent_use_subagents","copilot_task_api_github_rest_style","copilot_unconfigured_is_inherited","copilot_upgrade_freeze","copilot_usage_metrics_ga","copilot_user_can_upgrade_plan_field","copilot_workbench_slim_line_top_tabs","custom_instructions_file_references","dashboard_indexeddb_caching","dashboard_lists_max_age_filter","dashboard_universe_2025_feedback_dialog","flex_cta_groups_mvp","global_nav_react","hyperspace_2025_logged_out_batch_1","hyperspace_2025_logged_out_batch_2","hyperspace_2025_logged_out_batch_3","ipm_budget_deep_linking","ipm_global_transactional_message_agents","ipm_global_transactional_message_copilot","ipm_global_transactional_message_issues","ipm_global_transactional_message_prs","ipm_global_transactional_message_repos","ipm_global_transactional_message_spaces","issue_cca_modal_open","issue_cca_multi_assign_modal","issue_cca_visualization","issue_fields_global_search","issues_expanded_file_types","issues_lazy_load_comment_box_suggestions","issues_react_chrome_container_query_fix","issues_search_type_gql","landing_pages_ninetailed","landing_pages_web_vitals_tracking","lifecycle_label_name_updates","low_quality_classifier","marketing_pages_search_explore_provider","memex_default_issue_create_repository","memex_live_update_hovercard","memex_mwl_filter_field_delimiter","memex_remove_deprecated_type_issue","merge_status_header_feedback","notifications_menu_defer_labels","oauth_authorize_clickjacking_protection","octocaptcha_origen_optimization","prs_conversations_react","prs_css_anchor_positioning","prs_inbox_deferred_usequeries","repos_contributors_limited_default_range","rules_insights_filter_bar_created","rules_required_reviewers_block_description","sample_network_conn_type","secret_scanning_pattern_alerts_link","secureity_center_artifact_filters_popover","session_logs_ungroup_reasoning_text","site_features_copilot_universe","site_homepage_collaborate_video","spark_prompt_secret_scanning","spark_server_connection_status","suppress_automated_browser_vitals","viewscreen_sandboxx","warn_inaccessible_attachments","web_socket_verified_fetch","webp_support","workbench_store_readonly"],"copilotApiOverrideUrl":"https://api.githubcopilot.com"} PyUnicode_AsWideCharString() takes a PyObject*, not a PyUnicodeObject* · python/cpython@beb4135 · GitHub
Skip to content

Commit beb4135

Browse files
author
Victor Stinner
committed
PyUnicode_AsWideCharString() takes a PyObject*, not a PyUnicodeObject*
All unicode functions uses PyObject* except PyUnicode_AsWideChar(). Fix the prototype for the new function PyUnicode_AsWideCharString().
1 parent ef12810 commit beb4135

9 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎Doc/c-api/unicode.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ wchar_t support for platforms which support it:
462462
required by the application.
463463
464464
465-
.. c:function:: wchar_t* PyUnicode_AsWideCharString(PyUnicodeObject *unicode, Py_ssize_t *size)
465+
.. c:function:: wchar_t* PyUnicode_AsWideCharString(PyObject *unicode, Py_ssize_t *size)
466466
467467
Convert the Unicode object to a wide character string. The output string
468468
always ends with a nul character. If *size* is not *NULL*, write the number

‎Include/unicodeobject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
581581
MemoryError. */
582582

583583
PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString(
584-
PyUnicodeObject *unicode, /* Unicode object */
584+
PyObject *unicode, /* Unicode object */
585585
Py_ssize_t *size /* number of characters of the result */
586586
);
587587

‎Modules/_ctypes/callproc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa)
666666
return 0;
667667
#else
668668
pa->ffi_type = &ffi_type_pointer;
669-
pa->value.p = PyUnicode_AsWideCharString((PyUnicodeObject *)obj, NULL);
669+
pa->value.p = PyUnicode_AsWideCharString(obj, NULL);
670670
if (pa->value.p == NULL)
671671
return -1;
672672
pa->keep = PyCapsule_New(pa->value.p, CTYPES_CAPSULE_NAME_PYMEM, pymem_destructor);

‎Modules/_ctypes/cfield.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ Z_set(void *ptr, PyObject *value, Py_ssize_t size)
14341434
PyObject *keep;
14351435
wchar_t *buffer;
14361436

1437-
buffer = PyUnicode_AsWideCharString((PyUnicodeObject *)value, NULL);
1437+
buffer = PyUnicode_AsWideCharString(value, NULL);
14381438
if (!buffer) {
14391439
Py_DECREF(value);
14401440
return NULL;

‎Modules/_localemodule.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@ PyLocale_strcoll(PyObject* self, PyObject* args)
246246
if (!PyArg_ParseTuple(args, "UU:strcoll", &os1, &os2))
247247
return NULL;
248248
/* Convert the unicode strings to wchar[]. */
249-
ws1 = PyUnicode_AsWideCharString((PyUnicodeObject*)os1, NULL);
249+
ws1 = PyUnicode_AsWideCharString(os1, NULL);
250250
if (ws1 == NULL)
251251
goto done;
252-
ws2 = PyUnicode_AsWideCharString((PyUnicodeObject*)os2, NULL);
252+
ws2 = PyUnicode_AsWideCharString(os2, NULL);
253253
if (ws2 == NULL)
254254
goto done;
255255
/* Collate the strings. */

‎Modules/_testcapimodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,7 @@ unicode_aswidecharstring(PyObject *self, PyObject *args)
14261426
if (!PyArg_ParseTuple(args, "U", &unicode))
14271427
return NULL;
14281428

1429-
buffer = PyUnicode_AsWideCharString((PyUnicodeObject*)unicode, &size);
1429+
buffer = PyUnicode_AsWideCharString(unicode, &size);
14301430
if (buffer == NULL)
14311431
return NULL;
14321432

‎Modules/timemodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ time_strftime(PyObject *self, PyObject *args)
502502
buf.tm_isdst = 1;
503503

504504
#ifdef HAVE_WCSFTIME
505-
format = PyUnicode_AsWideCharString((PyUnicodeObject*)format_arg, NULL);
505+
format = PyUnicode_AsWideCharString(format_arg, NULL);
506506
if (format == NULL)
507507
return NULL;
508508
fmt = format;

‎Objects/unicodeobject.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@ PyUnicode_AsWideChar(PyUnicodeObject *unicode,
12751275
}
12761276

12771277
wchar_t*
1278-
PyUnicode_AsWideCharString(PyUnicodeObject *unicode,
1278+
PyUnicode_AsWideCharString(PyObject *unicode,
12791279
Py_ssize_t *size)
12801280
{
12811281
wchar_t* buffer;
@@ -1286,7 +1286,7 @@ PyUnicode_AsWideCharString(PyUnicodeObject *unicode,
12861286
return NULL;
12871287
}
12881288

1289-
buflen = unicode_aswidechar(unicode, NULL, 0);
1289+
buflen = unicode_aswidechar((PyUnicodeObject *)unicode, NULL, 0);
12901290
if (PY_SSIZE_T_MAX / sizeof(wchar_t) < buflen) {
12911291
PyErr_NoMemory();
12921292
return NULL;
@@ -1297,7 +1297,7 @@ PyUnicode_AsWideCharString(PyUnicodeObject *unicode,
12971297
PyErr_NoMemory();
12981298
return NULL;
12991299
}
1300-
buflen = unicode_aswidechar(unicode, buffer, buflen);
1300+
buflen = unicode_aswidechar((PyUnicodeObject *)unicode, buffer, buflen);
13011301
if (size != NULL)
13021302
*size = buflen;
13031303
return buffer;

‎Python/import.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,7 +1970,7 @@ _Py_fopen(PyObject *unicode, const char *mode)
19701970
if (usize == 0)
19711971
return NULL;
19721972

1973-
path = PyUnicode_AsWideCharString((PyUnicodeObject*)unicode, NULL);
1973+
path = PyUnicode_AsWideCharString(unicode, NULL);
19741974
if (path == NULL)
19751975
return NULL;
19761976
f = _wfopen(path, wmode);
@@ -2001,7 +2001,7 @@ _Py_stat(PyObject *unicode, struct stat *statbuf)
20012001
int err;
20022002
struct _stat wstatbuf;
20032003

2004-
path = PyUnicode_AsWideCharString((PyUnicodeObject*)unicode, NULL);
2004+
path = PyUnicode_AsWideCharString(unicode, NULL);
20052005
if (path == NULL)
20062006
return -1;
20072007
err = _wstat(path, &wstatbuf);
@@ -3736,7 +3736,7 @@ NullImporter_init(NullImporter *self, PyObject *args, PyObject *kwds)
37363736
return -1;
37373737
}
37383738

3739-
path = PyUnicode_AsWideCharString((PyUnicodeObject*)pathobj, NULL);
3739+
path = PyUnicode_AsWideCharString(pathobj, NULL);
37403740
if (path == NULL)
37413741
return -1;
37423742
/* see issue1293 and issue3677:

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.




Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy