Skip to content
This repository was archived by the owner on May 31, 2025. It is now read-only.

patch to support non-ascii string for #834#1024

Closed
furushchev wants to merge 18 commits intoros:kinetic-develfrom
furushchev:fix/610
Closed

patch to support non-ascii string for #834#1024
furushchev wants to merge 18 commits intoros:kinetic-develfrom
furushchev:fix/610

Conversation

@furushchev
Copy link
Copy Markdown
Contributor

@furushchev furushchev commented Apr 1, 2017 •
edited
Loading

I found that the pull request #834 does not support non-ascii rosparams.
Since @mgrrx does not permit pull request (I could not send pull request to his repository), I made another pull request.
This pull request also includes a test code for this issue.

I checked by:

# test.yaml
param: "ｎｏｔａｓｃｉｉ"  # this is not ascii
<!-- test.launch -->
<launch>
  <rosparam command="load" file="/tmp/test.yaml" />
</launch>

  • roslaunch /tmp/test.launch

    • ros:kinetic-devel:
$ roslaunch test.launch 
... logging to /root/.ros/log/0701c404-16c1-11e7-b3ce-0242ac110002/roslaunch-db478db0f966-22337.log
Checking log directory for disk usage. This may take awhile.
Press Ctrl-C to interrupt
Done checking log file disk usage. Usage is <1GB.

started roslaunch server http://db478db0f966:37491/

SUMMARY
========

PARAMETERS
 * /param: <...>
 * /rosdistro: kinetic
 * /rosversion: 1.12.6

NODES

auto-starting new master
process[master]: started with pid [22348]
ROS_MASTER_URI=http://localhost:11311

setting /run_id to 0701c404-16c1-11e7-b3ce-0242ac110002
process[rosout-1]: started with pid [22361]
started core service [/rosout]
  • mgrrx:fix/610:
# roslaunch test.launch 
... logging to /root/.ros/log/4446ff00-16c1-11e7-bf75-0242ac110002/roslaunch-db478db0f966-22439.log
Checking log directory for disk usage. This may take awhile.
Press Ctrl-C to interrupt
Done checking log file disk usage. Usage is <1GB.

started roslaunch server http://db478db0f966:38999/

SUMMARY
========

PARAMETERS
 * /param: <...>
 * /rosdistro: kinetic
 * /rosversion: 1.12.6

NODES

auto-starting new master
process[master]: started with pid [22450]
ROS_MASTER_URI=http://localhost:11311

setting /run_id to 4446ff00-16c1-11e7-bf75-0242ac110002
process[rosout-1]: started with pid [22465]
started core service [/rosout]
load_parameters: unable to set parameters (last param was [/rosdistro=kinetic
]): 'ascii' codec can't decode byte 0xef in position 607: ordinal not in range(128)
'ascii' codec can't decode byte 0xef in position 607: ordinal not in range(128)
The traceback for the exception was written to the log file
[rosout-1] killing on exit
[master] killing on exit

@mgrrx Could you please port my update (the latest 3 commits) to yours if it's ok?

mgrrx and others added 18 commits January 31, 2017 20:39
@mgrrx @jspricke
Fix for ros#610: Use HTTP/1.1 in XMLRPCRequestHandler
e629d90
@mgrrx @jspricke
Fix for ros#610: Added python-requests which provides a clean http li…
b742bac 
…brary for HTTP/1.1 requests
@mgrrx @jspricke
ros#610: rosgraph.xmlrpc.ServerProxy for roswtf
82bb411
@mgrrx @jspricke
ros#610: updated comment
8b3066d
@mgrrx @jspricke
ros#610: updated package.xml
79da64d
@mgrrx @jspricke
Rethrow the python-requests exception reason (e.g. socket.error) to b…
aa30729 
…e compatible with existing try...catch blocks
@mgrrx @jspricke
Rethrow the python-requests exception reason (e.g. socket.error) to b…
9c5e89b 
…e compatible with existing try...catch blocks
@mgrrx @jspricke
Added locking for xmlrpcapi cache
a80d254
@mgrrx @jspricke
ros#610: encoding
b077ed1
@mgrrx @jspricke
Alphabetical order in package.xml
bf97e27
@mgrrx @jspricke
added a clean up for the locks dict
1266c4d
@mgrrx @jspricke
Updated the ServerProxy imports to make the path smaller
80ff58b
@jspricke
Cleanup exception handling
77cdecd
@mgrrx
Reraise exception cleanly
cf80912
@mgrrx
Changed re-raising of exeptions. urllib3 has different exceptions now
d3fe16f
@furushchev
[rosgraph][transport.py] don't encode non-ascii string
0f4c5f6
@furushchev
[rosgraph][transport.py] encode response text
1a52344
@furushchev
[test_roslaunch][params_basic] test non-ascii params
40eea88
@furushchev furushchev mentioned this pull request Apr 1, 2017
Closed
@dirk-thomas
Copy link
Copy Markdown
Member

dirk-thomas commented Apr 5, 2017

@mgrrx This should be considered to be integrated into #834.

@mgrrx
Copy link
Copy Markdown
Contributor

mgrrx commented Apr 6, 2017

I merged your changes into #834. Thanks for your contribution!

@furushchev
Copy link
Copy Markdown
Contributor Author

furushchev commented Apr 6, 2017

@mgrrx Thanks for merging!

@furushchev furushchev closed this Apr 6, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@furushchev @dirk-thomas @mgrrx @jspricke