Skip to content

Commit cce54a1

Browse files
lgritzlgritz
authored
Revise license formatting to match other modern projects. (#33)
No change to the fact that this project is BSD-3-clause licensed. But this slight rewording/reformatting: * Brings the notices in line with the exact wording we use in other projects such as OSL. * Now will be correctly recognized by GitHub and other automated license checkers as being EXACTLY the same as the canonical BSD 3-clause license. This was approved by SPI legal.
1 parent 281419d commit cce54a1

File tree

6 files changed

+49
-126
lines changed

6 files changed

+49
-126
lines changed

‎LICENSE‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
1-
Copyright (c) 2008-2010, Sony Pictures Imageworks Inc
2-
All rights reserved.
1+
Copyright (c) 2008-present Contributors to the Pystring project.
2+
All Rights Reserved.
33

44
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are
6-
met:
5+
modification, are permitted provided that the following conditions are met:
76

8-
Redistributions of source code must retain the above copyright notice,
9-
this list of conditions and the following disclaimer.
10-
Redistributions in binary form must reproduce the above copyright
11-
notice, this list of conditions and the following disclaimer in the
12-
documentation and/or other materials provided with the distribution.
13-
Neither the name of the organization Sony Pictures Imageworks nor the
14-
names of its contributors
15-
may be used to endorse or promote products derived from this software
16-
without specific prior written permission.
17-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18-
"AS
19-
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
20-
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
21-
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22-
OWNER
23-
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24-
SPECIAL,
25-
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26-
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27-
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28-
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29-
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7+
1. Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
2. Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
14+
3. Neither the name of the copyright holder nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎README‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string. Implemented in C++, it does not require or make use of a python interpreter. It provides convenience and familiarity for common string operations not included in the standard C++ library. It's also useful in environments where both C++ and python are used.
1+
Pystring is a collection of C++ functions which match the interface and
2+
behavior of python's string class methods using std::string. Implemented in
3+
C++, it does not require or make use of a python interpreter. It provides
4+
convenience and familiarity for common string operations not included in the
5+
standard C++ library. It's also useful in environments where both C++ and
6+
python are used.
27

3-
Overlapping functionality (such as index and slice/substr) of std::string is included to match python interfaces.
8+
Overlapping functionality (such as index and slice/substr) of std::string is
9+
included to match python interfaces.
410

511
Originally developed at Sony Pictures Imageworks.
612
http://opensource.imageworks.com/
713

8-
Note: Despite the infrequent updates, this repo is not dead/abandoned - just stable! We use it every day at Imageworks.
14+
Note: Despite the infrequent updates, this repo is not dead/abandoned - just
15+
stable! We use it every day at Imageworks.

‎pystring.cpp‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,7 @@
1-
///////////////////////////////////////////////////////////////////////////////
2-
// Copyright (c) 2008-2010, Sony Pictures Imageworks Inc
3-
// All rights reserved.
4-
//
5-
// Redistribution and use in source and binary forms, with or without
6-
// modification, are permitted provided that the following conditions are
7-
// met:
8-
//
9-
// Redistributions of source code must retain the above copyright notice,
10-
// this list of conditions and the following disclaimer.
11-
// Redistributions in binary form must reproduce the above copyright
12-
// notice, this list of conditions and the following disclaimer in the
13-
// documentation and/or other materials provided with the distribution.
14-
// Neither the name of the organization Sony Pictures Imageworks nor the
15-
// names of its contributors
16-
// may be used to endorse or promote products derived from this software
17-
// without specific prior written permission.
18-
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19-
// "AS
20-
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21-
// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
22-
// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23-
// OWNER
24-
// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25-
// SPECIAL,
26-
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27-
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
28-
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
29-
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
30-
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31-
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32-
///////////////////////////////////////////////////////////////////////////////
1+
// Copyright Contributors to the Pystring project.
2+
// SPDX-License-Identifier: BSD-3-Clause
3+
// https://github.com/imageworks/pystring/blob/master/LICENSE
4+
335

346
#include "pystring.h"
357

‎pystring.h‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,7 @@
1-
///////////////////////////////////////////////////////////////////////////////
2-
// Copyright (c) 2008-2010, Sony Pictures Imageworks Inc
3-
// All rights reserved.
4-
//
5-
// Redistribution and use in source and binary forms, with or without
6-
// modification, are permitted provided that the following conditions are
7-
// met:
8-
//
9-
// Redistributions of source code must retain the above copyright notice,
10-
// this list of conditions and the following disclaimer.
11-
// Redistributions in binary form must reproduce the above copyright
12-
// notice, this list of conditions and the following disclaimer in the
13-
// documentation and/or other materials provided with the distribution.
14-
// Neither the name of the organization Sony Pictures Imageworks nor the
15-
// names of its contributors
16-
// may be used to endorse or promote products derived from this software
17-
// without specific prior written permission.
18-
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19-
// "AS
20-
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21-
// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
22-
// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23-
// OWNER
24-
// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25-
// SPECIAL,
26-
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27-
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
28-
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
29-
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
30-
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31-
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32-
///////////////////////////////////////////////////////////////////////////////
1+
// Copyright Contributors to the Pystring project.
2+
// SPDX-License-Identifier: BSD-3-Clause
3+
// https://github.com/imageworks/pystring/blob/master/LICENSE
4+
335

346
#ifndef INCLUDED_PYSTRING_H
357
#define INCLUDED_PYSTRING_H

‎test.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Copyright Contributors to the Pystring project.
2+
// SPDX-License-Identifier: BSD-3-Clause
3+
// https://github.com/imageworks/pystring/blob/master/LICENSE
4+
15
#include <iostream>
26

37
#include "pystring.h"

‎unittest.h‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,6 @@
1-
///////////////////////////////////////////////////////////////////////////////
2-
// Copyright (c) 2008-2010, Sony Pictures Imageworks Inc
3-
// All rights reserved.
4-
//
5-
// Redistribution and use in source and binary forms, with or without
6-
// modification, are permitted provided that the following conditions are
7-
// met:
8-
//
9-
// Redistributions of source code must retain the above copyright notice,
10-
// this list of conditions and the following disclaimer.
11-
// Redistributions in binary form must reproduce the above copyright
12-
// notice, this list of conditions and the following disclaimer in the
13-
// documentation and/or other materials provided with the distribution.
14-
// Neither the name of the organization Sony Pictures Imageworks nor the
15-
// names of its contributors
16-
// may be used to endorse or promote products derived from this software
17-
// without specific prior written permission.
18-
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19-
// "AS
20-
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21-
// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
22-
// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23-
// OWNER
24-
// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25-
// SPECIAL,
26-
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27-
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
28-
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
29-
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
30-
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31-
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32-
///////////////////////////////////////////////////////////////////////////////
1+
// Copyright Contributors to the Pystring project.
2+
// SPDX-License-Identifier: BSD-3-Clause
3+
// https://github.com/imageworks/pystring/blob/master/LICENSE
334

345
#ifndef INCLUDED_PYSTRING_UNITTEST_H
356
#define INCLUDED_PYSTRING_UNITTEST_H

0 commit comments

Comments
 (0)