Skip to content

Commit ce0ac38

Browse files
tim-majestictim-majestic
committed
v0.9.4
Fixed a bug where the valid API response code of "QueuedForProcessing" (returned from some commands) would be interpreted as an error. Improved license.
1 parent e1dfa5e commit ce0ac38

7 files changed

Lines changed: 85 additions & 88 deletions

File tree

‎GetBackLinkData.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11

2-
# Version 0.9.3
2+
# Copyright 2015, Majestic-12 Ltd trading as Majestic
3+
# https://majestic.com
34
#
4-
# Copyright (c) 2011, Majestic-12 Ltd
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
88
# modification, are permitted provided that the following conditions are met:
9-
# 1. Redistributions of source code must retain the above copyright
10-
# notice, this list of conditions and the following disclaimer.
11-
# 2. 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-
# 3. Neither the name of the Majestic-12 Ltd nor the
15-
# names of its contributors may be used to endorse or promote products
16-
# derived from this software without specific prior written permission.
9+
#
10+
# * Redistributions of source code must retain the above copyright
11+
# notice, this list of conditions and the following disclaimer.
12+
#
13+
# * Redistributions in binary form must reproduce the above copyright
14+
# notice, this list of conditions and the following disclaimer in the
15+
# documentation and/or other materials provided with the distribution.
16+
#
17+
# * Neither the name of Majestic-12 Ltd, its trademarks, nor any contributors
18+
# to the software may be used to endorse or promote products derived from
19+
# this software without specific prior written permission.
1720
#
1821
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1922
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

‎GetIndexItemInfo.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11

2-
# Version 0.9.3
2+
# Copyright 2015, Majestic-12 Ltd trading as Majestic
3+
# https://majestic.com
34
#
4-
# Copyright (c) 2011, Majestic-12 Ltd
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
88
# modification, are permitted provided that the following conditions are met:
9-
# 1. Redistributions of source code must retain the above copyright
10-
# notice, this list of conditions and the following disclaimer.
11-
# 2. 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-
# 3. Neither the name of the Majestic-12 Ltd nor the
15-
# names of its contributors may be used to endorse or promote products
16-
# derived from this software without specific prior written permission.
9+
#
10+
# * Redistributions of source code must retain the above copyright
11+
# notice, this list of conditions and the following disclaimer.
12+
#
13+
# * Redistributions in binary form must reproduce the above copyright
14+
# notice, this list of conditions and the following disclaimer in the
15+
# documentation and/or other materials provided with the distribution.
16+
#
17+
# * Neither the name of Majestic-12 Ltd, its trademarks, nor any contributors
18+
# to the software may be used to endorse or promote products derived from
19+
# this software without specific prior written permission.
1720
#
1821
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1922
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

‎LICENSE.txt‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,29 @@
1-
2-
Version 0.9.3
3-
4-
Copyright (c) 2011, Majestic-12 Ltd
1+
Copyright 2015, Majestic-12 Ltd trading as Majestic
2+
https://majestic.com
53

64
All rights reserved.
75

8-
9-
106
Redistribution and use in source and binary forms, with or without
11-
127
modification, are permitted provided that the following conditions are met:
138

149
* Redistributions of source code must retain the above copyright
15-
1610
notice, this list of conditions and the following disclaimer.
1711

1812
* Redistributions in binary form must reproduce the above copyright
19-
2013
notice, this list of conditions and the following disclaimer in the
21-
2214
documentation and/or other materials provided with the distribution.
2315

24-
* Neither the name of the Majestic-12 Ltd nor the
25-
26-
names of its contributors may be used to endorse or promote products
27-
28-
derived from this software without specific prior written permission.
29-
30-
16+
* Neither the name of Majestic-12 Ltd, its trademarks, nor any contributors
17+
to the software may be used to endorse or promote products derived from
18+
this software without specific prior written permission.
3119

3220
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
33-
3421
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
35-
3622
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
37-
3823
DISCLAIMED. IN NO EVENT SHALL Majestic-12 Ltd BE LIABLE FOR ANY
39-
4024
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
41-
4225
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
43-
4426
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
45-
4627
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
47-
4828
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
49-
50-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎OpenAppGetIndexItemInfo.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11

2-
# Version 0.9.3
2+
# Copyright 2015, Majestic-12 Ltd trading as Majestic
3+
# https://majestic.com
34
#
4-
# Copyright (c) 2011, Majestic-12 Ltd
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
88
# modification, are permitted provided that the following conditions are met:
9-
# 1. Redistributions of source code must retain the above copyright
10-
# notice, this list of conditions and the following disclaimer.
11-
# 2. 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-
# 3. Neither the name of the Majestic-12 Ltd nor the
15-
# names of its contributors may be used to endorse or promote products
16-
# derived from this software without specific prior written permission.
9+
#
10+
# * Redistributions of source code must retain the above copyright
11+
# notice, this list of conditions and the following disclaimer.
12+
#
13+
# * Redistributions in binary form must reproduce the above copyright
14+
# notice, this list of conditions and the following disclaimer in the
15+
# documentation and/or other materials provided with the distribution.
16+
#
17+
# * Neither the name of Majestic-12 Ltd, its trademarks, nor any contributors
18+
# to the software may be used to endorse or promote products derived from
19+
# this software without specific prior written permission.
1720
#
1821
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1922
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

‎majesticseo_external_rpc/APIService.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11

2-
# Version 0.9.3
2+
# Copyright 2015, Majestic-12 Ltd trading as Majestic
3+
# https://majestic.com
34
#
4-
# Copyright (c) 2011, Majestic-12 Ltd
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
88
# modification, are permitted provided that the following conditions are met:
9-
# 1. Redistributions of source code must retain the above copyright
10-
# notice, this list of conditions and the following disclaimer.
11-
# 2. 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-
# 3. Neither the name of the Majestic-12 Ltd nor the
15-
# names of its contributors may be used to endorse or promote products
16-
# derived from this software without specific prior written permission.
9+
#
10+
# * Redistributions of source code must retain the above copyright
11+
# notice, this list of conditions and the following disclaimer.
12+
#
13+
# * Redistributions in binary form must reproduce the above copyright
14+
# notice, this list of conditions and the following disclaimer in the
15+
# documentation and/or other materials provided with the distribution.
16+
#
17+
# * Neither the name of Majestic-12 Ltd, its trademarks, nor any contributors
18+
# to the software may be used to endorse or promote products derived from
19+
# this software without specific prior written permission.
1720
#
1821
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1922
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

‎majesticseo_external_rpc/DataTable.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11

2-
# Version 0.9.3
2+
# Copyright 2015, Majestic-12 Ltd trading as Majestic
3+
# https://majestic.com
34
#
4-
# Copyright (c) 2011, Majestic-12 Ltd
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
88
# modification, are permitted provided that the following conditions are met:
9-
# 1. Redistributions of source code must retain the above copyright
10-
# notice, this list of conditions and the following disclaimer.
11-
# 2. 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-
# 3. Neither the name of the Majestic-12 Ltd nor the
15-
# names of its contributors may be used to endorse or promote products
16-
# derived from this software without specific prior written permission.
9+
#
10+
# * Redistributions of source code must retain the above copyright
11+
# notice, this list of conditions and the following disclaimer.
12+
#
13+
# * Redistributions in binary form must reproduce the above copyright
14+
# notice, this list of conditions and the following disclaimer in the
15+
# documentation and/or other materials provided with the distribution.
16+
#
17+
# * Neither the name of Majestic-12 Ltd, its trademarks, nor any contributors
18+
# to the software may be used to endorse or promote products derived from
19+
# this software without specific prior written permission.
1720
#
1821
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1922
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

‎majesticseo_external_rpc/Response.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11

2-
# Version 0.9.3
2+
# Copyright 2015, Majestic-12 Ltd trading as Majestic
3+
# https://majestic.com
34
#
4-
# Copyright (c) 2011, Majestic-12 Ltd
55
# All rights reserved.
66
#
77
# Redistribution and use in source and binary forms, with or without
88
# modification, are permitted provided that the following conditions are met:
9-
# 1. Redistributions of source code must retain the above copyright
10-
# notice, this list of conditions and the following disclaimer.
11-
# 2. 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-
# 3. Neither the name of the Majestic-12 Ltd nor the
15-
# names of its contributors may be used to endorse or promote products
16-
# derived from this software without specific prior written permission.
9+
#
10+
# * Redistributions of source code must retain the above copyright
11+
# notice, this list of conditions and the following disclaimer.
12+
#
13+
# * Redistributions in binary form must reproduce the above copyright
14+
# notice, this list of conditions and the following disclaimer in the
15+
# documentation and/or other materials provided with the distribution.
16+
#
17+
# * Neither the name of Majestic-12 Ltd, its trademarks, nor any contributors
18+
# to the software may be used to endorse or promote products derived from
19+
# this software without specific prior written permission.
1720
#
1821
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1922
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -54,7 +57,7 @@ def __init__(self, response, code = None, error_message = None):
5457

5558
""" Indicates whether the response is ok """
5659
def is_ok(self):
57-
return 'OK' == self.attributes['Code']
60+
return self.get_code() in {'OK', 'QueuedForProcessing'};
5861

5962
"""
6063
Returns the Response's message code - 'OK' represents predicted state, all else represents an error.

0 commit comments

Comments
 (0)