Merge lp://staging/~verterok/txstatsd/py3ksupport into lp://staging/txstatsd

Proposed by Guillermo Gonzalez
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 108
Merged at revision: 106
Proposed branch: lp://staging/~verterok/txstatsd/py3ksupport
Merge into: lp://staging/txstatsd
Diff against target: 337 lines (+58/-39)
11 files modified
.bzrignore (+1/-0)
txstatsd/metrics/distinctmetric.py (+8/-2)
txstatsd/metrics/metric.py (+1/-1)
txstatsd/stats/uniformsample.py (+4/-3)
txstatsd/tests/metrics/test_distinct.py (+4/-3)
txstatsd/tests/metrics/test_histogrammetric.py (+1/-1)
txstatsd/tests/metrics/test_sli.py (+6/-2)
txstatsd/tests/test_httpinfo.py (+2/-2)
txstatsd/tests/test_metrics.py (+22/-21)
txstatsd/tests/test_router.py (+1/-1)
txstatsd/tests/test_service.py (+8/-3)
To merge this branch: bzr merge lp://staging/~verterok/txstatsd/py3ksupport
Reviewer Review Type Date Requested Status
Sidnei da Silva Approve
Review via email: mp+152169@code.staging.launchpad.net

Commit message

Initial py3k support, only the client side.

Description of the change

Initial py3k support, only the client side.

To post a comment you must log in.
Revision history for this message
Sidnei da Silva (sidnei) :
review: Approve
106. By Guillermo Gonzalez

merge with trunk

107. By Guillermo Gonzalez

also support py2.6

108. By Guillermo Gonzalez

simplify version_info check

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches