hash
stringlengths 40
40
| diff
stringlengths 131
26.7k
| message
stringlengths 7
694
| project
stringlengths 5
67
| split
stringclasses 1
value | diff_languages
stringlengths 2
24
|
|---|---|---|---|---|---|
2b4d31613391443426f75d57440c43dfed246b74 | diff --git a/bin/gulp.js b/bin/gulp.js
index <HASH>..<HASH> 100755
--- a/bin/gulp.js
+++ b/bin/gulp.js
@@ -38,7 +38,7 @@ if (argv.v || argv.version) {
if (!localGulp) {
gutil.log(gutil.colors.red('No local gulp install found in'), getLocalBase(gulpFile));
- gutil.log(gutil.colors.red('You need to npm install it first'));
+ gutil.log(gutil.colors.red('Perhaps do: npm install gulp'));
process.exit(1);
} | More helpful suggestion on how to npm install gulp
Useful for when user only did npm install gulp -g | ratson_gulp-v4 | train | js |
bba9d00dec48e0d0fea4160d7f53433ab605c4d4 | diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -15,3 +15,7 @@ exports.parseForESLint = function(code, options) {
patched = true;
return { ast: require("./parse-with-patch")(code, options) };
};
+
+exports.parseNoPatch = function(code, options) {
+ return require("./parse")(code, options);
+};
diff --git a/test/babel-eslint.js b/test/babel-eslint.js
index <HASH>..<HASH> 100644
--- a/test/babel-eslint.js
+++ b/test/babel-eslint.js
@@ -531,3 +531,12 @@ describe("babylon-to-esprima", () => {
});
});
});
+
+describe("Public API", () => {
+ it("exports a parseNoPatch function", () => {
+ assertImplementsAST(
+ espree.parse("foo"),
+ babelEslint.parseNoPatch("foo", {})
+ );
+ });
+}); | Re-add parseNoPatch function (accidentally removed) (#<I>) | babel_babel-eslint | train | js,js |
c9f21a54b55124c6db7a42cf26f7c05eb5d4e534 | diff --git a/library/src/test/java/com/orm/util/KeyWordUtilTest.java b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
index <HASH>..<HASH> 100644
--- a/library/src/test/java/com/orm/util/KeyWordUtilTest.java
+++ b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
@@ -3,12 +3,19 @@ package com.orm.util;
import org.junit.Test;
import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
/**
* @author jonatan.salas
*/
public final class KeyWordUtilTest {
+ @Test(expected = IllegalAccessException.class)
+ public void testPrivateConstructor() throws Exception {
+ KeyWordUtil keyWordUtil = (KeyWordUtil) Class.forName(KeyWordUtil.class.getName()).getDeclaredConstructor().newInstance();
+ assertNull(keyWordUtil);
+ }
+
@Test
public void testKeyWord() {
assertEquals(true, KeyWordUtil.isKeyword("SELECT")); | Added test for private constructor in KeyWordUtil | chennaione_sugar | train | java |
1cb8d790b64f542406a576b878d67abe284e7275 | diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1398,12 +1398,13 @@ class UnitOfWork implements PropertyChangedListener
public function addToIdentityMap($entity)
{
$classMetadata = $this->em->getClassMetadata(get_class($entity));
- $idHash = implode(' ', $this->entityIdentifiers[spl_object_hash($entity)]);
+ $identifier = $this->entityIdentifiers[spl_object_hash($entity)];
- if ($idHash === '') {
+ if (in_array(null, $identifier, true)) {
throw ORMInvalidArgumentException::entityWithoutIdentity($classMetadata->name, $entity);
}
+ $idHash = implode(' ', $identifier);
$className = $classMetadata->rootEntityName;
if (isset($this->identityMap[$className][$idHash])) { | Disallowing `null` as part of the entity identifier | doctrine_orm | train | php |
576832ab7a5327b862adc17123f555f27beb4188 | diff --git a/src/Exception/RequestException.php b/src/Exception/RequestException.php
index <HASH>..<HASH> 100644
--- a/src/Exception/RequestException.php
+++ b/src/Exception/RequestException.php
@@ -25,7 +25,8 @@ class RequestException extends TransferException
ResponseInterface $response = null,
\Exception $previous = null
) {
- parent::__construct($message, 0, $previous);
+ $code = $response ? $response->getStatusCode() : 0;
+ parent::__construct($message, $code, $previous);
$this->request = $request;
$this->response = $response;
}
diff --git a/tests/Exception/RequestExceptionTest.php b/tests/Exception/RequestExceptionTest.php
index <HASH>..<HASH> 100644
--- a/tests/Exception/RequestExceptionTest.php
+++ b/tests/Exception/RequestExceptionTest.php
@@ -76,4 +76,9 @@ class RequestExceptionTest extends \PHPUnit_Framework_TestCase
$e->emittedError(true);
$e->emittedError(false);
}
+
+ public function testHasStatusCodeAsExceptionCode() {
+ $e = RequestException::create(new Request('GET', '/'), new Response(442));
+ $this->assertEquals(442, $e->getCode());
+ }
} | Fixes #<I> : HTTP Status Code is also Exception code | guzzle_guzzle | train | php,php |
d0929ae77cb8ae719eb2c6077605fc9713f69c78 | diff --git a/core/src/main/java/org/infinispan/statetransfer/OutboundTransferTask.java b/core/src/main/java/org/infinispan/statetransfer/OutboundTransferTask.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/infinispan/statetransfer/OutboundTransferTask.java
+++ b/core/src/main/java/org/infinispan/statetransfer/OutboundTransferTask.java
@@ -227,7 +227,7 @@ public class OutboundTransferTask implements Runnable {
List<StateChunk> chunks = new ArrayList<StateChunk>();
for (Map.Entry<Integer, List<InternalCacheEntry>> e : entriesBySegment.entrySet()) {
List<InternalCacheEntry> entries = e.getValue();
- if (!entries.isEmpty()) {
+ if (!entries.isEmpty() || isLast) {
chunks.add(new StateChunk(e.getKey(), new ArrayList<InternalCacheEntry>(entries), isLast));
entries.clear();
} | ISPN-<I> StateChunk with isLastChunk=true not sent when all entries are sent ahead
Ensure that the last chunk is always sent, even if empty. | infinispan_infinispan | train | java |
1eb8f523a607f5c2fac947af363ceb8beca5a57c | diff --git a/Event/FilterEvents.php b/Event/FilterEvents.php
index <HASH>..<HASH> 100644
--- a/Event/FilterEvents.php
+++ b/Event/FilterEvents.php
@@ -5,7 +5,7 @@ namespace Lexik\Bundle\FormFilterBundle\Event;
/**
* Available filter events.
*
- * @author Cédric Girard <[email protected]>
+ * @author Cédric Girard <[email protected]>
*/
class FilterEvents
{ | Update FilterEvents.php | lexik_LexikFormFilterBundle | train | php |
8b5352af298ec0318fd6c243d48e612f14c1afff | diff --git a/src/lambda/handler-runner/docker-runner/DockerRunner.js b/src/lambda/handler-runner/docker-runner/DockerRunner.js
index <HASH>..<HASH> 100644
--- a/src/lambda/handler-runner/docker-runner/DockerRunner.js
+++ b/src/lambda/handler-runner/docker-runner/DockerRunner.js
@@ -15,7 +15,10 @@ export default class DockerRunner {
provider,
} = funOptions
- this.#codeDir = dockerOptions.hostServicePath || codeDir
+ this.#codeDir = codeDir
+ if (dockerOptions.hostServicePath && this.#codeDir === funOptions.servicePath) {
+ this.#codeDir = dockerOptions.hostServicePath
+ }
this.#container = new DockerContainer(
env,
functionKey, | Overwrite codeDir with hostServicePath only if function is not published from an artifact | dherault_serverless-offline | train | js |
931c8d3ed271ebfdfb3de3b731a864ef1e7ac17e | diff --git a/src/Traits/ReflectionFunctionLikeTrait.php b/src/Traits/ReflectionFunctionLikeTrait.php
index <HASH>..<HASH> 100644
--- a/src/Traits/ReflectionFunctionLikeTrait.php
+++ b/src/Traits/ReflectionFunctionLikeTrait.php
@@ -222,7 +222,8 @@ trait ReflectionFunctionLikeTrait
$variablesCollector = new StaticVariablesCollector();
$nodeTraverser->addVisitor($variablesCollector);
- $nodeTraverser->traverse($this->functionLikeNode->getStmts());
+ /* @see https://github.com/nikic/PHP-Parser/issues/235 */
+ $nodeTraverser->traverse($this->functionLikeNode->getStmts() ?: array());
return $variablesCollector->getStaticVariables();
} | Fix an issue with empty method bodies for interfaces/abstract methods | goaop_parser-reflection | train | php |
27013dad7946b12fd9d0131da9f487f9e7b4701b | diff --git a/src/org/apache/cassandra/db/TimeFilter.java b/src/org/apache/cassandra/db/TimeFilter.java
index <HASH>..<HASH> 100644
--- a/src/org/apache/cassandra/db/TimeFilter.java
+++ b/src/org/apache/cassandra/db/TimeFilter.java
@@ -146,6 +146,6 @@ class TimeFilter implements IFilter
public DataInputBuffer next(String key, String cf, SSTable ssTable) throws IOException
{
- return ssTable.next( key, cf, new IndexHelper.TimeRange( timeLimit_, System.currentTimeMillis() ) );
+ return ssTable.next( key, cf, new IndexHelper.TimeRange( timeLimit_, Long.MAX_VALUE ) );
}
} | semantics of TimeFilter (include all columns newer than some timestamp) mean we should use Long.MAX_VALUE as upper range, not current ms. patch by jbellis; reviewed by Jun Rau. see #<I>
git-svn-id: <URL> | Stratio_stratio-cassandra | train | java |
43053d90d93ba75b009de99059763398efa7f6b5 | diff --git a/xchange-btce/src/main/java/com/xeiam/xchange/btce/service/BTCEHmacPostBodyDigest.java b/xchange-btce/src/main/java/com/xeiam/xchange/btce/service/BTCEHmacPostBodyDigest.java
index <HASH>..<HASH> 100644
--- a/xchange-btce/src/main/java/com/xeiam/xchange/btce/service/BTCEHmacPostBodyDigest.java
+++ b/xchange-btce/src/main/java/com/xeiam/xchange/btce/service/BTCEHmacPostBodyDigest.java
@@ -78,7 +78,7 @@ public class BTCEHmacPostBodyDigest implements ParamsDigest {
try {
String postBody = restMethodMetadata.getRequestBody();
mac.update(postBody.getBytes("UTF-8"));
- return String.format("%040x", new BigInteger(1, mac.doFinal()));
+ return String.format("%0128x", new BigInteger(1, mac.doFinal()));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException("Illegal encoding, check the code.", e);
} | Update BTCEHmacPostBodyDigest.java
leading zero omitted in BTC-E Sign header | knowm_XChange | train | java |
e70f647479a3413fd398d226f84719e9d06170ab | diff --git a/user.go b/user.go
index <HASH>..<HASH> 100644
--- a/user.go
+++ b/user.go
@@ -2,6 +2,13 @@ package goinsta
// User is the representation of instagram's user profile
type User struct {
+ //Feed *Feed
+ //Followers *Followers
+ //Following *Following
+ //Status *Friendship
+ //Story *Story
+ //Messages *Messages
+
ID int64 `json:"pk"`
Username string `json:"username"`
FullName string `json:"full_name"` | Added user field objects as scheme specification | ahmdrz_goinsta | train | go |
53b41e371e5d86ba97e1cf85ec7ed81cf2df1652 | diff --git a/lib/rest-graph/core.rb b/lib/rest-graph/core.rb
index <HASH>..<HASH> 100644
--- a/lib/rest-graph/core.rb
+++ b/lib/rest-graph/core.rb
@@ -549,6 +549,7 @@ class RestGraph < RestGraphStruct
end
def cache_assign uri, value
+ return unless cache
cache[cache_key(uri)] = value
end
diff --git a/test/test_cache.rb b/test/test_cache.rb
index <HASH>..<HASH> 100644
--- a/test/test_cache.rb
+++ b/test/test_cache.rb
@@ -32,10 +32,12 @@ describe RestGraph do
should 'update cache if there is cache option set to false' do
@rg.get('cache') .should == @body
- stub_request(:get, @url).to_return(:body => @body.reverse).times(1)
+ stub_request(:get, @url).to_return(:body => @body.reverse).times(2)
@rg.get('cache') .should == @body
@rg.get('cache', {}, :cache => false).should == @body.reverse
@rg.get('cache') .should == @body.reverse
+ @rg.cache = nil
+ @rg.get('cache', {}, :cache => false).should == @body.reverse
end
end | core.rb: fix nil cache bug, sorry, that's a huge bug... | godfat_rest-core | train | rb,rb |
b703df0d7e9931f3c40d8d9733e5d15e5fc398e3 | diff --git a/VerySimpleHtmlWriter/HtmlWriterService.php b/VerySimpleHtmlWriter/HtmlWriterService.php
index <HASH>..<HASH> 100644
--- a/VerySimpleHtmlWriter/HtmlWriterService.php
+++ b/VerySimpleHtmlWriter/HtmlWriterService.php
@@ -2,7 +2,7 @@
namespace Yivoff\VerySimpleHtmlWriter;
-class HtmlWriter
+class HtmlWriterService
{
/** | wrong name for the HtmlWriterService class. Corrected. I promise not to do this again. | yivi_VerySimpleHtmlWriter | train | php |
253394d6141ebb98d50bec3e843233a659a40d6e | diff --git a/openquake/db/models.py b/openquake/db/models.py
index <HASH>..<HASH> 100644
--- a/openquake/db/models.py
+++ b/openquake/db/models.py
@@ -474,6 +474,9 @@ class JobStats(models.Model):
# The number of total sites in job
num_sites = models.IntegerField()
+ class Meta: # pylint: disable=C0111,W0232
+ db_table = 'uiapi\".\"job_stats'
+
class OqParams(models.Model):
''' | added meta for JobStats model | gem_oq-engine | train | py |
6b771622e180e60a55000c51b90e9298dd94aecc | diff --git a/dwave/cloud/client.py b/dwave/cloud/client.py
index <HASH>..<HASH> 100644
--- a/dwave/cloud/client.py
+++ b/dwave/cloud/client.py
@@ -133,7 +133,7 @@ class Client(object):
permissive_ssl=False, **kwargs):
"""To setup the connection a pipeline of queues/workers is constructed.
- There are five interations with the server the connection manages:
+ There are five interactions with the server the connection manages:
1. Downloading solver information.
2. Submitting problem data.
3. Polling problem status. | Fix typo: interations -> interactions | dwavesystems_dwave-cloud-client | train | py |
1ca742cc7f015df9e3e3d0bd02f298bfdd6ed53d | diff --git a/openid/consumer/consumer.py b/openid/consumer/consumer.py
index <HASH>..<HASH> 100644
--- a/openid/consumer/consumer.py
+++ b/openid/consumer/consumer.py
@@ -361,11 +361,6 @@ class OpenIDConsumer(object):
"""
self.store = store
- def _createNonce(self):
- nonce = cryptutil.randomString(self.NONCE_LEN, self.NONCE_CHRS)
- self.store.storeNonce(nonce)
- return nonce
-
def begin(self, service_endpoint, session):
nonce = self._createNonce()
token = self._genToken(
@@ -463,6 +458,11 @@ class OpenIDConsumer(object):
return FailureResponse(identity_url,
'Invalid openid.mode: %r' % (mode,))
+ def _createNonce(self):
+ nonce = cryptutil.randomString(self.NONCE_LEN, self.NONCE_CHRS)
+ self.store.storeNonce(nonce)
+ return nonce
+
def _makeKVPost(self, args, server_url):
mode = args['openid.mode']
body = urllib.urlencode(args) | [project @ Move _createNonce method] | openid_python-openid | train | py |
e8e37b7b819eaf3ef2f5f95b9ff37a6f96f2bb8c | diff --git a/Uploader/Storage/FilesystemStorage.php b/Uploader/Storage/FilesystemStorage.php
index <HASH>..<HASH> 100644
--- a/Uploader/Storage/FilesystemStorage.php
+++ b/Uploader/Storage/FilesystemStorage.php
@@ -20,7 +20,6 @@ class FilesystemStorage implements StorageInterface
{
$filesystem = new Filesystem();
- $name = is_null($name) ? $file->getRelativePathname() : $name;
$path = is_null($path) ? $name : sprintf('%s/%s', $path, $name);
$path = sprintf('%s/%s', $this->directory, $path); | Removed unused line of code. | 1up-lab_OneupUploaderBundle | train | php |
4b9042cbb0f2ebb7e7d6afebe5e5c239187391d2 | diff --git a/Slim.js b/Slim.js
index <HASH>..<HASH> 100644
--- a/Slim.js
+++ b/Slim.js
@@ -29,7 +29,7 @@ var Slim = function (_CustomElement2) {
* Best practice to call polyfill in <head> section of the HTML
* @example
* <head>
- * <script src="./path/to/slim/Slim.min.js></script>
+ * <script src="./path/to/slim/Slim.min.js"></script>
* <script>
* Slim.polyfill('./path/to/web-components-polyfill.js');
* </script> | Fix syntax error in comments (#9) | slimjs_slim.js | train | js |
38feb52f879becb4649a68bda9a029c677a11fa4 | diff --git a/qtawesome/icon_browser.py b/qtawesome/icon_browser.py
index <HASH>..<HASH> 100644
--- a/qtawesome/icon_browser.py
+++ b/qtawesome/icon_browser.py
@@ -99,7 +99,7 @@ class IconBrowser(QtWidgets.QMainWindow):
desktop = QtWidgets.QApplication.desktop()
screen = desktop.screenNumber(desktop.cursor().pos())
centerPoint = desktop.screenGeometry(screen).center()
- except:
+ except AttributeError:
screen = QtGui.QGuiApplication.screenAt(QtGui.QCursor.pos())
centerPoint = screen.geometry().center()
@@ -126,7 +126,7 @@ class IconBrowser(QtWidgets.QMainWindow):
# supported in Qt 5.12 or later.
try:
self._proxyModel.setFilterRegExp(reString)
- except:
+ except AttributeError:
self._proxyModel.setFilterRegularExpression(reString)
def _triggerDelayedUpdate(self): | Catch the appropriate exception only instead of bare "except" | spyder-ide_qtawesome | train | py |
c45ce61550c680c3067b1cc6b16d1b40e891eddd | diff --git a/src/babel/generation/generators/types.js b/src/babel/generation/generators/types.js
index <HASH>..<HASH> 100644
--- a/src/babel/generation/generators/types.js
+++ b/src/babel/generation/generators/types.js
@@ -39,6 +39,12 @@ export function Property(node, print) {
print(node.key);
this.push("]");
} else {
+ // print `({ foo: foo = 5 } = {})` as `({ foo = 5 } = {});`
+ if (t.isAssignmentPattern(node.value) && t.isIdentifier(node.key) && node.key.name === node.value.left.name) {
+ print(node.value);
+ return;
+ }
+
print(node.key);
// shorthand! | print assignment pattern shorthand with matching key nicely | babel_babel | train | js |
03e4ea5290ea4237474d9fd0c59e6bbb7e494fcb | diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -250,8 +250,8 @@ module ActiveRecord
# Close then reopen the connection.
def reconnect!
if @connection.respond_to?(:reset)
- @connection.reset
clear_cache!
+ @connection.reset
configure_connection
else
disconnect! | clear cache before resetting the connection | rails_rails | train | rb |
a55632e8165b4546c323937134dcbc22ff3aae7a | diff --git a/src/models/Repository/SubscriptionsRepository.php b/src/models/Repository/SubscriptionsRepository.php
index <HASH>..<HASH> 100644
--- a/src/models/Repository/SubscriptionsRepository.php
+++ b/src/models/Repository/SubscriptionsRepository.php
@@ -355,9 +355,13 @@ class SubscriptionsRepository extends Repository
public function getNotRenewedSubscriptions($date)
{
+ $notRenewedUsers = $this->getTable();
+
$allSubscriptions = $this->actualSubscriptions($date)->select('user_id');
- $notRenewedUsers = $this->getTable()
- ->where('user_id NOT IN', $allSubscriptions)
+ if ($allSubscriptions->count() > 0) {
+ $notRenewedUsers->where('user_id NOT IN (?)', $allSubscriptions);
+ }
+ $notRenewedUsers
->where('end_time < ?', $date)
->where('subscription_type.print = ? ', 1)
->group('user_id'); | Fix getNotRenewedSubscriptions query building
Query for `SubscriptionsRepository::getNotRenewedSubscriptions` didn't
work if no results were returned from `actualSubscriptions`.
Fixes errors:
- Possible SQL query corruption. Add parentheses around operators.
- Syntax error or access violation: <I> You have an error in your SQL
syntax.
remp/crm#<I> | remp2020_crm-subscriptions-module | train | php |
d2cf300739a784c8f44fd1218ddd1232f05d3655 | diff --git a/src/routes.php b/src/routes.php
index <HASH>..<HASH> 100644
--- a/src/routes.php
+++ b/src/routes.php
@@ -2,11 +2,11 @@
Route::group(config('shop.routes.admin', []), function() {
- Route::match( array( 'GET', 'POST' ), 'admin/do', array(
+ Route::match( array( 'POST' ), 'admin/do', array(
'as' => 'aimeos_shop_admin_json',
'uses' => 'Aimeos\Shop\Controller\AdminController@doAction'
));
- Route::match( array( 'GET', 'POST' ), 'admin', array(
+ Route::match( array( 'GET' ), 'admin', array(
'as' => 'aimeos_shop_admin',
'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction'
)); | Limit allowed HTTP methods to enforce CSRF protection | aimeos_aimeos-laravel | train | php |
4fb94781f3d3479eb8b9aace39332ae49f51ed2d | diff --git a/src/main/java/org/jboss/pressgang/ccms/model/contentspec/TranslatedCSNode.java b/src/main/java/org/jboss/pressgang/ccms/model/contentspec/TranslatedCSNode.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/pressgang/ccms/model/contentspec/TranslatedCSNode.java
+++ b/src/main/java/org/jboss/pressgang/ccms/model/contentspec/TranslatedCSNode.java
@@ -135,23 +135,6 @@ public class TranslatedCSNode extends AuditedEntity implements HasTranslatedStri
}
@Transient
- public TranslatedTopicData getTranslatedTopicData() {
- return getTranslatedTopicDatas().isEmpty() ? null : getTranslatedTopicDatas().iterator().next();
- }
-
- @Transient
- public void setTranslatedTopicData(final TranslatedTopicData translatedTopicData) {
- // Remove any TranslatedTopics that currently exist
- for (final TranslatedTopicData translatedTopic : getTranslatedTopicDatas()) {
- removeTranslatedTopicData(translatedTopic);
- }
- // Set the Translated Topic
- if (translatedTopicData != null) {
- addTranslatedTopicData(translatedTopicData);
- }
- }
-
- @Transient
public CSNode getEnversCSNode(final EntityManager entityManager) {
if (enversCSNode == null) {
/* Find the envers topic */ | Removed methods that shouldn't have existed. | pressgang-ccms_PressGangCCMSModel | train | java |
43a4e1bbe4091b11d7926b93250cc87fa75bd545 | diff --git a/transformers/pipelines.py b/transformers/pipelines.py
index <HASH>..<HASH> 100755
--- a/transformers/pipelines.py
+++ b/transformers/pipelines.py
@@ -293,8 +293,11 @@ class QuestionAnsweringPipeline(Pipeline):
def __call__(self, *args, **kwargs):
# Position args, handling is sensibly the same as X and data, so forwarding to avoid duplicating
- if args is not None and len(args) > 1:
- kwargs['X'] = args
+ if args is not None and len(args) > 0:
+ if len(args) == 1:
+ kwargs['X'] = args[0]
+ else:
+ kwargs['X'] = list(args)
# Generic compatibility with sklearn and Keras
# Batched data | Adressing issue in varargs handling for question answering. | huggingface_pytorch-pretrained-BERT | train | py |
0062a890915f66f7c43934ee848735ff45052eb9 | diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/access/PrincipalRemove.java b/domain-management/src/main/java/org/jboss/as/domain/management/access/PrincipalRemove.java
index <HASH>..<HASH> 100644
--- a/domain-management/src/main/java/org/jboss/as/domain/management/access/PrincipalRemove.java
+++ b/domain-management/src/main/java/org/jboss/as/domain/management/access/PrincipalRemove.java
@@ -43,6 +43,8 @@ public class PrincipalRemove implements OperationStepHandler {
@Override
public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
context.removeResource(PathAddress.EMPTY_ADDRESS);
+
+ context.stepCompleted();
}
} | [WFLY-<I>] / [WFLY-<I>] Mark principal removal as being complete. | wildfly_wildfly | train | java |
2942f2c2462425fdc6cf78b2bf11c628bd4c42de | diff --git a/themes/socialbase/src/Plugin/Alter/SocialBaseThemeSuggestions.php b/themes/socialbase/src/Plugin/Alter/SocialBaseThemeSuggestions.php
index <HASH>..<HASH> 100644
--- a/themes/socialbase/src/Plugin/Alter/SocialBaseThemeSuggestions.php
+++ b/themes/socialbase/src/Plugin/Alter/SocialBaseThemeSuggestions.php
@@ -21,7 +21,7 @@ class SocialBaseThemeSuggestions extends ThemeSuggestions {
public function alter(&$suggestions, &$context1 = NULL, &$hook = NULL) {
parent::alter($suggestions, $context1, $hook);
- $variables = Variables::create($context1);
+ $variables = $this->variables;
switch ($hook) { | Issue #<I> by maikelkoopman: reuse existing variable in parent | goalgorilla_open_social | train | php |
07ad9b02f2b8407a898b6ba4f39a97de83f9708a | diff --git a/scripts/start.js b/scripts/start.js
index <HASH>..<HASH> 100644
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -43,6 +43,6 @@ new WebpackDevServer(webpack(config), {
execSync('ps cax | grep "Google Chrome"');
execSync('open -a "Google Chrome" http://localhost:3000/');
} catch(e) {
- // Do nothing if Chrome cannot be opened
+ // Do nothing if Chrome isn't opened or cannot be opened
}
}); | Open url in Chrome if app is already opened | vcarl_create-react-app | train | js |
8ff2db28a3e5487830f6e6f253d9e7b37dc38d2c | diff --git a/baron/dumper.py b/baron/dumper.py
index <HASH>..<HASH> 100644
--- a/baron/dumper.py
+++ b/baron/dumper.py
@@ -39,6 +39,16 @@ def while_(node):
yield ":"
yield dump_node_list(node["third_formatting"])
yield dump_node_list(node["value"])
+ if node["else"]:
+ yield dump_node(node["else"])
+
+
+def else_(node):
+ yield "else"
+ yield dump_node_list(node["first_formatting"])
+ yield ":"
+ yield dump_node_list(node["second_formatting"])
+ yield dump_node_list(node["value"])
dumpers = {
@@ -50,6 +60,7 @@ dumpers = {
"assignment": assignment,
"binary_operator": binary_operator,
"while": while_,
+ "else": else_,
}
diff --git a/baron/test_dumper.py b/baron/test_dumper.py
index <HASH>..<HASH> 100644
--- a/baron/test_dumper.py
+++ b/baron/test_dumper.py
@@ -27,3 +27,7 @@ def test_binary_operator():
def test_while():
check_dumps("while a : pass")
+
+
+def test_while_else():
+ check_dumps("while a : pass\nelse : pass") | [enh] dumps while_else | PyCQA_baron | train | py,py |
b7a953c2825f137df2655d963cd4f2254ff625ef | diff --git a/ruby_vcloud_sdk/spec/unit/client_spec.rb b/ruby_vcloud_sdk/spec/unit/client_spec.rb
index <HASH>..<HASH> 100644
--- a/ruby_vcloud_sdk/spec/unit/client_spec.rb
+++ b/ruby_vcloud_sdk/spec/unit/client_spec.rb
@@ -626,7 +626,10 @@ module VCloudSdk
end
describe "VCD Adapter client", :instantiate_template, :all do
- it "instantiates a vApp from the catalog", :positive do
+ xit "instantiates a vApp from the catalog", :positive do
+ # marked pending because it failed on our local dev environment,
+ # and it's unclear if BOSH team is going to maintain ownership
+ # of this gem
conn = create_mock_client
client = Client.new(nil, username, password, entities, control, conn)
catalog_vapp_id = Test::Response::EXISTING_VAPP_TEMPLATE_CATALOG_URN | [ruby_vcloud_sdk] mark failing test as pending | cloudfoundry_bosh | train | rb |
a530971581de21a2513ce34ebcfdb9172f6b5881 | diff --git a/PDO.php b/PDO.php
index <HASH>..<HASH> 100644
--- a/PDO.php
+++ b/PDO.php
@@ -158,7 +158,7 @@ class sb_PDO extends PDO{
* Used to prepare and store sql statements for value binding
*
* @param string $sql
- * @return PDO_Statement A PDO_statment instance
+ * @return PDOStatement A PDO_statment instance
*/
public function prepare($sql, $driver_options=array()){ | fixed PHPdocs on sb_PDO so that it says sb_PDO::prepare returns a PDOStatement and not PDO_Statement | surebert_surebert-framework | train | php |
7a0229364acde10c1ecacb54fdfaf4abbc4cf2ed | diff --git a/falafel/core/evaluators.py b/falafel/core/evaluators.py
index <HASH>..<HASH> 100644
--- a/falafel/core/evaluators.py
+++ b/falafel/core/evaluators.py
@@ -7,7 +7,6 @@ from falafel.core.plugins import validate_response
from falafel.core.context import Context
from falafel.core.archives import InvalidArchive
from falafel.util.uname import Uname
-from falafel import util
from falafel.core import reducer
import logging
diff --git a/falafel/util/__init__.py b/falafel/util/__init__.py
index <HASH>..<HASH> 100644
--- a/falafel/util/__init__.py
+++ b/falafel/util/__init__.py
@@ -41,9 +41,11 @@ def make_iter(item):
return [item]
-def ensure_dir(path):
+def ensure_dir(path, dirname=False):
log = logging.getLogger(__name__)
try:
+ if dirname:
+ path = os.path.dirname(path)
log.debug("Ensure dir '%s'", path)
os.makedirs(path)
except Exception as e: | Fixing test failures that didn't show up without a fresh clone | RedHatInsights_insights-core | train | py,py |
0d7540dab53d25d1ba77933e496642ff268b5eb3 | diff --git a/examples/recurse.py b/examples/recurse.py
index <HASH>..<HASH> 100644
--- a/examples/recurse.py
+++ b/examples/recurse.py
@@ -17,12 +17,12 @@
"""
A very simple example of recursive nested tasks.
Each task maps 2 others tasks, each of these 2 tasks maps 2 others, etc.,
-up to RECURSIVITY_LEVEL.
+up to RECURSIVITY_DEPTH.
"""
from scoop import futures
-RECURSIVITY_LEVEL = 12
+RECURSIVITY_DEPTH = 12
def recursiveFunc(level):
if level == 0:
@@ -30,12 +30,8 @@ def recursiveFunc(level):
else:
args = [level-1] * 2
s = sum(futures.map(recursiveFunc, args))
- if level == RECURSIVITY_LEVEL:
- print("2^{level} = {s}".format(
- level=level,
- s=s
- ))
return s
if __name__ == "__main__":
- recursiveFunc(RECURSIVITY_LEVEL)
+ result = recursiveFunc(RECURSIVITY_DEPTH)
+ print("2^{RECURSIVITY_DEPTH} = {result}".format(**locals())) | + Simplified recurse example | soravux_scoop | train | py |
75b9f8cb4cb2acf48a79ce0cd737dcbd674f6be3 | diff --git a/.eslintrc.js b/.eslintrc.js
index <HASH>..<HASH> 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,8 @@
module.exports = {
extends: [
'onelint'
- ]
+ ],
+ "rules": {
+ "block-scoped-var": 0
+ }
}; | disable block-scoped-var rule (reverse of funcscope in jshint) | assetgraph_assetgraph | train | js |
1ebe24305d6ba4055427edd01b417784bdc0f01e | diff --git a/runtime/profile/profile.go b/runtime/profile/profile.go
index <HASH>..<HASH> 100644
--- a/runtime/profile/profile.go
+++ b/runtime/profile/profile.go
@@ -22,5 +22,6 @@ func Platform() []string {
// and expects a k8s service name
"MICRO_PROXY=go.micro.proxy",
"MICRO_PROXY_ADDRESS=micro-proxy:8081",
+ "GOPROXY=http://athens-proxy",
}
} | Configure Platform Profile to use Athens Proxy (#<I>) | micro_micro | train | go |
749f07ceff39115fc024e2bdc9faaaf7abff40f5 | diff --git a/lib/spring/watcher/listen.rb b/lib/spring/watcher/listen.rb
index <HASH>..<HASH> 100644
--- a/lib/spring/watcher/listen.rb
+++ b/lib/spring/watcher/listen.rb
@@ -5,17 +5,31 @@ module Spring
def self.available?
require "listen"
+ require "listen/version"
true
rescue LoadError
false
end
+ def listen_klass
+ if ::Listen::VERSION >= "1.0.0"
+ ::Listen::Listener
+ else
+ ::Listen::MultiListener
+ end
+ end
+
def start
unless @listener
- @listener = ::Listen::MultiListener.new(*base_directories)
+ @listener = listen_klass.new(*base_directories, relative_paths: false)
@listener.latency(latency)
@listener.change(&method(:changed))
- @listener.start(false)
+
+ if ::Listen::VERSION >= "1.0.0"
+ @listener.start
+ else
+ @listener.start(false)
+ end
end
end
diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb
index <HASH>..<HASH> 100644
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_test.rb
@@ -3,7 +3,8 @@ require "tmpdir"
require "fileutils"
require "active_support/core_ext/numeric/time"
require "spring/watcher"
-require "listen"
+
+raise "listen not loaded" unless Spring::Watcher::Listen.available?
module WatcherTests
LATENCY = 0.001 | Fix breakage / warnings caused by listen <I> | rails_spring | train | rb,rb |
aa8af8fbe76238d749a1deb876fbe67e5cce670f | diff --git a/src/com/opera/core/systems/OperaDriver.java b/src/com/opera/core/systems/OperaDriver.java
index <HASH>..<HASH> 100644
--- a/src/com/opera/core/systems/OperaDriver.java
+++ b/src/com/opera/core/systems/OperaDriver.java
@@ -323,6 +323,15 @@ public class OperaDriver extends RemoteWebDriver implements TakesScreenshot, Run
}
}
+ @Override
+ public void finalize() throws Throwable {
+ try {
+ quit();
+ } finally {
+ super.finalize();
+ }
+ }
+
public void get(String url) {
get(url, OperaIntervals.PAGE_LOAD_TIMEOUT.getMs());
} | Clean up on dereference of object | operasoftware_operaprestodriver | train | java |
33c9fb8b71955c3182808fdfc869b1e1d0a1191a | diff --git a/concrete/src/Permission/Access/Access.php b/concrete/src/Permission/Access/Access.php
index <HASH>..<HASH> 100644
--- a/concrete/src/Permission/Access/Access.php
+++ b/concrete/src/Permission/Access/Access.php
@@ -489,7 +489,15 @@ class Access extends ConcreteObject
$filter .= $pae->getAccessEntityID() . ':';
}
$filter = trim($filter, ':');
- $paID = $this->getPermissionAccessID();
+ if ($this->listItems !== null) {
+ $aeIDs = [];
+ foreach ($this->listItems as $listItem) {
+ $aeIDs[] = $listItem->getPermissionAccessID();
+ }
+ $paID = implode(':', $aeIDs);
+ } else {
+ $paID = $this->getPermissionAccessID();
+ }
$class = strtolower(get_class($this->pk));
return sprintf('permission/access/list_items/%s/%s/%s', $paID, $filter, $class); | Avoid to cache permission access list items for drafts
(cherry picked from commit <I>ba<I>d<I>aefcaf<I>fa<I>ae<I>c1b) | concrete5_concrete5 | train | php |
a823415b8c742da55c468aba9f2b609bd6d6fbde | diff --git a/crafty-local.js b/crafty-local.js
index <HASH>..<HASH> 100644
--- a/crafty-local.js
+++ b/crafty-local.js
@@ -1,3 +1,8 @@
+/* This file aggregates all the src/ files at runtime.
+ * You just need to source this file, then any changes in src/ files will be automatically sourced.
+ * Therefore, you do not need to regenerate crafty.js (by bulid.sh) anymore each time when you make changes in src/.
+ */
+
(function (window) {
var include = [
'core',
@@ -46,4 +51,4 @@
output += "\n//@ sourceURL=crafty.js";
eval(output);
-})(window);
\ No newline at end of file
+})(window); | Added document for crafty-local.js | craftyjs_Crafty | train | js |
1b30319104bd33df56879e9118e2039c47f973be | diff --git a/Routing/RoutingLoader.php b/Routing/RoutingLoader.php
index <HASH>..<HASH> 100755
--- a/Routing/RoutingLoader.php
+++ b/Routing/RoutingLoader.php
@@ -39,9 +39,7 @@ class RoutingLoader extends FileLoader
'object' => array(
'pattern' => '/{pk}/{action}',
'defaults' => array(),
- 'requirements' => array(
- '_method' => 'POST'
- ),
+ 'requirements' => array(),
'controller' => 'actions',
),
'batch' => array( | [FIX] Object action could be not csrf protected => post is not a requirement for routing
Developper must handle this case | symfony2admingenerator_AdmingeneratorGeneratorBundle | train | php |
4eeb5fb76bde960fe56e4a59668fc62358cc5033 | diff --git a/searx/engines/reddit.py b/searx/engines/reddit.py
index <HASH>..<HASH> 100644
--- a/searx/engines/reddit.py
+++ b/searx/engines/reddit.py
@@ -13,7 +13,7 @@
import json
from cgi import escape
from urllib import urlencode
-from urlparse import urlparse
+from urlparse import urlparse, urljoin
from datetime import datetime
# engine dependent config
@@ -21,7 +21,8 @@ categories = ['general', 'images', 'news', 'social media']
page_size = 25
# search-url
-search_url = 'https://www.reddit.com/search.json?{query}'
+base_url = 'https://www.reddit.com/'
+search_url = base_url + 'search.json?{query}'
# do search-request
@@ -52,7 +53,7 @@ def response(resp):
# extract post information
params = {
- 'url': data['url'],
+ 'url': urljoin(base_url, data['permalink']),
'title': data['title']
}
@@ -61,6 +62,7 @@ def response(resp):
url_info = urlparse(thumbnail)
# netloc & path
if url_info[1] != '' and url_info[2] != '':
+ params['img_src'] = data['url']
params['thumbnail_src'] = thumbnail
params['template'] = 'images.html'
img_results.append(params) | [fix] incorrect URLs in Reddit results - closes #<I> | asciimoo_searx | train | py |
098fb3f351b73c97cbc077625ca606b6b2fc7da2 | diff --git a/fastlane/lib/fastlane/commands_generator.rb b/fastlane/lib/fastlane/commands_generator.rb
index <HASH>..<HASH> 100644
--- a/fastlane/lib/fastlane/commands_generator.rb
+++ b/fastlane/lib/fastlane/commands_generator.rb
@@ -119,16 +119,14 @@ module Fastlane
# CrashlyticsBetaCommandLineHandler.apply_options(c)
c.action do |args, options|
- # if args[0] == 'beta'
- # beta_info = CrashlyticsBetaCommandLineHandler.info_from_options(options)
- # Fastlane::CrashlyticsBeta.new(beta_info, Fastlane::CrashlyticsBetaUi.new).run
- # else
is_swift_fastfile = args.include?("swift")
Fastlane::Setup.start(user: options.user, is_swift_fastfile: is_swift_fastfile)
- # end
end
end
+ # Creating alias for mapping "swift init" to "init swift"
+ alias_command(:'swift init', :init, 'swift')
+
command :new_action do |c|
c.syntax = 'fastlane new_action'
c.description = 'Create a new custom action for fastlane.' | Added alias for 'swift init' to map to 'init swift' (#<I>)
* Added alias for 'swift init' to map to 'init swift'
* Always rubocop | fastlane_fastlane | train | rb |
58eb5e4ae7632d4f7e0fb80f2a1a87a825c04ac4 | diff --git a/lib/cucumber_analytics/world.rb b/lib/cucumber_analytics/world.rb
index <HASH>..<HASH> 100644
--- a/lib/cucumber_analytics/world.rb
+++ b/lib/cucumber_analytics/world.rb
@@ -2,7 +2,7 @@ module CucumberAnalytics
module World
- SANITARY_STRING = '___!!!___'
+ SANITARY_STRING = '___SANITIZED_BY_CUCUMBER_ANALYTICS___'
STEP_KEYWORD_PATTERN = '\s*(?:Given|When|Then|And|But|\*)\s*'
TEST_ELEMENT_START_PATTERN = '^\s*(?:@|Background:|Scenario:|(?:Scenario Outline:))' | Refactoring
Improved the probably uniqueness of a placeholder string. | enkessler_cucumber_analytics | train | rb |
d164d78e00ea7be27cda1ae7ddae7b2e64a99d1b | diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from setuptools import setup, find_packages
setup(name="oauth2",
- version="1.0.9",
+ version="1.1.0",
description="Library for OAuth version 1.0a.",
author="Joe Stump",
author_email="[email protected]", | Upped the version in preparation for release. | TimSC_python-oauth10a | train | py |
1a87e0c4ca07fb2e2d08c36839ccf28ea5723c70 | diff --git a/py3status/modules/imap.py b/py3status/modules/imap.py
index <HASH>..<HASH> 100644
--- a/py3status/modules/imap.py
+++ b/py3status/modules/imap.py
@@ -78,14 +78,11 @@ class Py3status:
self.connection = None
self.mail_error = None # cannot throw self.py3.error from thread
self.command_tag = 0 # IMAPcommands are tagged, so responses can be matched up to requests
+ self.idle_thread = Thread(target=self._get_mail_count, daemon=True)
if self.security not in ["ssl", "starttls"]:
raise ValueError("Unknown security protocol")
- self.idle_thread = Thread(target=self._get_mail_count, daemon=True)
- if self.use_idle:
- self.idle_thread.start()
-
def check_mail(self):
# I -- acquire mail_count
if self.use_idle is not False:
@@ -223,7 +220,6 @@ class Py3status:
except (socket_error, imaplib.IMAP4.abort, imaplib.IMAP4.readonly) as e:
self.py3.log("Recoverable error - " + str(e), level=self.py3.LOG_WARNING)
self._disconnect()
- self.mail_count = None
except (imaplib.IMAP4.error, Exception) as e:
self.mail_error = "Fatal error - " + str(e)
self._disconnect() | incorporate laser's feedback
* dont't start the thread in _post_config_hook(), as it'll get started
in check_mail() anyways
* don't hide imap-thingy when we run into a recoverable error; just
display the old (cached) mail_count | ultrabug_py3status | train | py |
bcdfa8d746f72af5189299edf4b3d7a451ddb589 | diff --git a/lib/demo/index.js b/lib/demo/index.js
index <HASH>..<HASH> 100644
--- a/lib/demo/index.js
+++ b/lib/demo/index.js
@@ -16,10 +16,10 @@ define(function(require, exports, module) {
var help = require('demo/commands/help');
help.startup();
help.helpMessages.prefix = "<h2>Welcome to GCLI</h2>" +
- "<p>GCLI is an experiment to create a highly usable JavaScript command line for developers." +
+ "<p>GCLI is an experiment to create a highly usable JavaScript command line for developers.</p>" +
"<p>Useful links: " +
"<a target='_blank' href='https://github.com/joewalker/gcli'>source</a> (BSD), " +
"<a target='_blank' href='https://github.com/joewalker/gcli/blob/master/docs/index.md'>documentation</a> (for users/embedders), " +
- "<a target='_blank' href='https://wiki.mozilla.org/DevTools/Features/GCLI'>Mozilla feature page</a> (for GCLI in the web console).";
+ "<a target='_blank' href='https://wiki.mozilla.org/DevTools/Features/GCLI'>Mozilla feature page</a> (for GCLI in the web console).</p>";
}); | Bug <I> (namespace): For help to work in xhtml mode
we should close the tags properly. | joewalker_gcli | train | js |
5c48ba228c2bd91c2e1ead6c542e6631294abb99 | diff --git a/ezibpy/ezibpy.py b/ezibpy/ezibpy.py
index <HASH>..<HASH> 100644
--- a/ezibpy/ezibpy.py
+++ b/ezibpy/ezibpy.py
@@ -1201,6 +1201,7 @@ class ezIBpy():
(contract.m_expiry == "" or contract.m_strike == "" or contract.m_right == ""):
return True
+ tickerId = self.tickerId(contract)
if tickerId in self.contract_details and \
len(self.contract_details[tickerId]["contracts"]) > 1:
return True | bugfix (added tickerId) | ranaroussi_ezibpy | train | py |
46fff8c8fa1bd55fe7e17ed44f6cc5aeea822d4c | diff --git a/src/Util/ActivityUtil.php b/src/Util/ActivityUtil.php
index <HASH>..<HASH> 100644
--- a/src/Util/ActivityUtil.php
+++ b/src/Util/ActivityUtil.php
@@ -29,14 +29,14 @@ abstract class ActivityUtil
$output->write(preg_replace('/^/m', ' ', $log));
}
);
- switch ($activity->getState()) {
- case Activity::SUCCESS:
+ switch ($activity['result']) {
+ case 'success':
if ($success !== null) {
$output->writeln($success);
}
return true;
- case Activity::FAILURE:
+ case 'failure':
if ($failure !== null) {
$output->writeln($failure);
} | Activity success is reported through 'result' not 'state' | platformsh_platformsh-cli | train | php |
5494a9dd3bf3d6c07fb5dbf6f5e74d90a57fe2c3 | diff --git a/src/base-apis.js b/src/base-apis.js
index <HASH>..<HASH> 100644
--- a/src/base-apis.js
+++ b/src/base-apis.js
@@ -564,6 +564,20 @@ MatrixBaseApis.prototype.addRoomToGroup = function(groupId, roomId) {
/**
* @param {string} groupId
+ * @param {string} roomId
+ * @return {module:client.Promise} Resolves: Empty object
+ * @return {module:http-api.MatrixError} Rejects: with an error response.
+ */
+MatrixBaseApis.prototype.removeRoomFromGroup = function(groupId, roomId) {
+ const path = utils.encodeUri(
+ "/groups/$groupId/admin/rooms/$roomId",
+ {$groupId: groupId, $roomId: roomId},
+ );
+ return this._http.authedRequest(undefined, "DELETE", path, undefined, {});
+};
+
+/**
+ * @param {string} groupId
* @return {module:client.Promise} Resolves: Empty object
* @return {module:http-api.MatrixError} Rejects: with an error response.
*/ | Implement wrapper API for removing a room from a group | matrix-org_matrix-js-sdk | train | js |
4665e601cdbcf76682d1edd64ee314ed5b64e8fb | diff --git a/packages/cli-plugin-scaffold-react-package/index.js b/packages/cli-plugin-scaffold-react-package/index.js
index <HASH>..<HASH> 100644
--- a/packages/cli-plugin-scaffold-react-package/index.js
+++ b/packages/cli-plugin-scaffold-react-package/index.js
@@ -70,10 +70,6 @@ module.exports = [
)
.replace(/\\/g, "/");
- console.log(baseTsConfigPath);
- console.log(baseTsConfigBuildPath);
- console.log(baseTsConfigBuildPath);
-
// Copy template files
await ncp(sourceFolder, location); | chore(scaffolding): remove console logs | Webiny_webiny-js | train | js |
6c682a34e15cb5effd8430a97c4dae2d4a165a91 | diff --git a/jslib/jslib.go b/jslib/jslib.go
index <HASH>..<HASH> 100644
--- a/jslib/jslib.go
+++ b/jslib/jslib.go
@@ -2,7 +2,7 @@ package jslib
import (
"fmt"
- "github.com/metakeule/gopherjs/build"
+ "github.com/gopherjs/gopherjs/build"
"io"
"io/ioutil"
"os"
diff --git a/tool.go b/tool.go
index <HASH>..<HASH> 100644
--- a/tool.go
+++ b/tool.go
@@ -4,8 +4,8 @@ import (
"code.google.com/p/go.tools/go/types"
"flag"
"fmt"
+ gbuild "github.com/gopherjs/gopherjs/build"
"github.com/gopherjs/gopherjs/compiler"
- gbuild "github.com/metakeule/gopherjs/build"
"go/build"
"go/scanner"
"io/ioutil" | change import paths back to gopherjs/gopherjs | gopherjs_gopherjs | train | go,go |
e8b83dd80da2dfb1292f0c72682b2b9e255a7150 | diff --git a/tests/ExceptionTest.php b/tests/ExceptionTest.php
index <HASH>..<HASH> 100644
--- a/tests/ExceptionTest.php
+++ b/tests/ExceptionTest.php
@@ -123,8 +123,14 @@ class ExceptionTest extends TestCase
"Exception system message incorrect"
);
+ $previous = $e->getPrevious();
+
+ $this->assertTrue(
+ $previous instanceof \Exception
+ );
+
$this->assertSame(
- $previousException->getMessage(), $e->getPrevious()->getMessage(),
+ $previousException->getMessage(), $previous->getMessage(),
"Previous exception not included"
); | Tidied second previous Exception check. | AyeAyeApi_Api | train | php |
0758bc55741ab697b8dbe78cd746fe74c39ebe6a | diff --git a/src/Payment/Application.php b/src/Payment/Application.php
index <HASH>..<HASH> 100644
--- a/src/Payment/Application.php
+++ b/src/Payment/Application.php
@@ -36,6 +36,7 @@ use EasyWeChat\OfficialAccount;
* @method mixed close(string $tradeNo)
* @method mixed reverse(string $orderNo)
* @method mixed reverseByTransactionId(string $transactionId)
+ * @method mixed handleNotify(callable $callback, \Symfony\Component\HttpFoundation\Request $request = null)
*/
class Application extends ServiceContainer
{ | Update Application.php (#<I>) | overtrue_wechat | train | php |
c0c70de2153b656ca4dce58bc7e5a04c3f2a67da | diff --git a/salt/modules/cron.py b/salt/modules/cron.py
index <HASH>..<HASH> 100644
--- a/salt/modules/cron.py
+++ b/salt/modules/cron.py
@@ -289,12 +289,14 @@ def raw_cron(user):
# Preserve line endings
lines = sdecode(__salt__['cmd.run_stdout'](cmd,
runas=user,
+ ignore_retcode=True,
rstrip=False,
python_shell=False)).splitlines(True)
else:
cmd = 'crontab -u {0} -l'.format(user)
# Preserve line endings
lines = sdecode(__salt__['cmd.run_stdout'](cmd,
+ ignore_retcode=True,
rstrip=False,
python_shell=False)).splitlines(True) | Regression to ignore retcodes on crontab calls | saltstack_salt | train | py |
f3370ecc9b6c02729e4d3542cfa060fc2d603e87 | diff --git a/manager/api/gateway/src/test/java/io/apiman/manager/api/gateway/rest/GatewayClientTest.java b/manager/api/gateway/src/test/java/io/apiman/manager/api/gateway/rest/GatewayClientTest.java
index <HASH>..<HASH> 100644
--- a/manager/api/gateway/src/test/java/io/apiman/manager/api/gateway/rest/GatewayClientTest.java
+++ b/manager/api/gateway/src/test/java/io/apiman/manager/api/gateway/rest/GatewayClientTest.java
@@ -71,7 +71,11 @@ public class GatewayClientTest {
exception.printStackTrace(new PrintWriter(sw));
String output = sw.toString();
- Assert.assertEquals(EXPECTED_STACK, output);
+ Assert.assertEquals(normalize(EXPECTED_STACK), normalize(output));
+ }
+
+ private static String normalize(String output) {
+ return output.replaceAll("\r\n", "\n");
}
} | fixed a platform issue in a test | apiman_apiman | train | java |
f732756ffb80de11992701e78add2ae60d7f41af | diff --git a/spring-social-facebook-web/src/main/java/org/springframework/social/facebook/web/FacebookCookieValue.java b/spring-social-facebook-web/src/main/java/org/springframework/social/facebook/web/FacebookCookieValue.java
index <HASH>..<HASH> 100644
--- a/spring-social-facebook-web/src/main/java/org/springframework/social/facebook/web/FacebookCookieValue.java
+++ b/spring-social-facebook-web/src/main/java/org/springframework/social/facebook/web/FacebookCookieValue.java
@@ -32,7 +32,7 @@ import java.lang.annotation.Target;
public @interface FacebookCookieValue {
/**
- * The specific element of the cookie to be bound (e.g., "uid", "access_token", etc)
+ * The specific element of the cookie to be bound (e.g., "uid", "expires", etc)
*/
public String value() default ""; | Removed mention of 'access_token' in JavaDoc for @FacebookCookieValue, since access tokens won't be available from the cookie after July 1. | spring-projects_spring-social-facebook | train | java |
a779e9d21ea643fc61d6fc8e0f4da76832dfc3f9 | diff --git a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
+++ b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
@@ -87,6 +87,7 @@ public class MapByNameTest {
ChronicleMap<CharSequence, CharSequence> myMap2 = mapByName.from("myMap");
}
+ @Ignore("causing issues on windows")
@Test
public void testReplicationHubSerialization() throws IOException, InterruptedException,
TimeoutException { | added - @Ignore("causing issues on windows") | OpenHFT_Chronicle-Map | train | java |
ff94c99545ba8285128415abb64aa477c67c89c8 | diff --git a/src/Detail/Bernard/Message/MessageFactoryInterface.php b/src/Detail/Bernard/Message/MessageFactoryInterface.php
index <HASH>..<HASH> 100644
--- a/src/Detail/Bernard/Message/MessageFactoryInterface.php
+++ b/src/Detail/Bernard/Message/MessageFactoryInterface.php
@@ -7,7 +7,7 @@ interface MessageFactoryInterface
/**
* Does the factory accept the provided message?
*
- * @param $message
+ * @param mixed $message
* @return boolean
*/
public function accepts($message); | Completed controller action that applies changed user images (Detail\File items) from the IronMQ Push Queue (ZFSKELETON-3) | detailnet_dfw-bernard | train | php |
3a59a222b4bdb30c5bc0b10b9d00fd4cf822b61b | diff --git a/fastlane_core/lib/fastlane_core/version.rb b/fastlane_core/lib/fastlane_core/version.rb
index <HASH>..<HASH> 100644
--- a/fastlane_core/lib/fastlane_core/version.rb
+++ b/fastlane_core/lib/fastlane_core/version.rb
@@ -1,3 +1,3 @@
module FastlaneCore
- VERSION = "0.57.1".freeze
+ VERSION = "0.57.2".freeze
end | Version bump (#<I>) | fastlane_fastlane | train | rb |
ca49ede9d921232a3116894dde5d7b13290599f2 | diff --git a/spec/support/crud.rb b/spec/support/crud.rb
index <HASH>..<HASH> 100644
--- a/spec/support/crud.rb
+++ b/spec/support/crud.rb
@@ -125,7 +125,8 @@ module Mongo
# @since 2.0.0
attr_reader :description
- FAIL_POINT_BASE_COMMAND = { configureFailPoint: "onPrimaryTransactionalWrite" }
+ # Spec tests have configureFailPoint as a string, make it a string here too
+ FAIL_POINT_BASE_COMMAND = { 'configureFailPoint' => "onPrimaryTransactionalWrite" }
# Instantiate the new CRUDTest.
# | RUBY-<I> Repair failpoint usage | mongodb_mongo-ruby-driver | train | rb |
3fc045c75ba5779021122b7641c1e335063dd223 | diff --git a/moskito-webcontrol/java/net/java/dev/moskito/webcontrol/feed/HttpGetter.java b/moskito-webcontrol/java/net/java/dev/moskito/webcontrol/feed/HttpGetter.java
index <HASH>..<HASH> 100644
--- a/moskito-webcontrol/java/net/java/dev/moskito/webcontrol/feed/HttpGetter.java
+++ b/moskito-webcontrol/java/net/java/dev/moskito/webcontrol/feed/HttpGetter.java
@@ -29,7 +29,7 @@ public class HttpGetter implements FeedGetter {
String encoding = new BASE64Encoder().encode(credentials.toString().getBytes());
connection.setRequestProperty("Authorization", "Basic " + encoding);
}
- if (connection.getContentType().startsWith("text/xml")) {
+ if (connection.getContentType() != null && connection.getContentType().startsWith("text/xml")) {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setIgnoringElementContentWhitespace(true);
return dbf.newDocumentBuilder().parse((InputStream) connection.getContent()); | MSK-<I>, NPE when content type is null fixed | anotheria_moskito | train | java |
20ae23681376d685ed7c3711a2c198f317c8c726 | diff --git a/katcp/testutils.py b/katcp/testutils.py
index <HASH>..<HASH> 100644
--- a/katcp/testutils.py
+++ b/katcp/testutils.py
@@ -522,6 +522,18 @@ class BlockingTestClient(client.BlockingClient):
self.assert_sensor_not_equal(sensorname, expected, sensortype,
msg=msg, places=places)
+ def wait_condition(self, timeout, predicate, *args, **kwargs):
+ """ Wait for the boolean function `predicate(*args, **kwargs)` to become True.
+ Default polling period is 0.02s. A different period may be set by specifying
+ 'poll_period' as a named arg in the predicate."""
+ t0 = time.time()
+ poll_period = kwargs.pop('poll_period', 0.02)
+ cond = predicate(*args, **kwargs)
+ while not (cond or (time.time()-t0 >timeout)):
+ time.sleep(poll_period)
+ cond = predicate(*args, **kwargs)
+ return (cond, '' if cond else 'Timed out after %s seconds' % timeout)
+
def wait_until_sensor_equals(self, timeout, sensorname, value,
sensortype=str, places=7, pollfreq=0.02):
"""Wait until a sensor's value equals the given value, or times out. | Added wait_condition(). Fixed wait_until_sensor_equals() to return immediately if sensor value is already good | ska-sa_katcp-python | train | py |
7382193897f31d15e0805736103c0468586570db | diff --git a/src/notebook/api/kernel.js b/src/notebook/api/kernel.js
index <HASH>..<HASH> 100644
--- a/src/notebook/api/kernel.js
+++ b/src/notebook/api/kernel.js
@@ -44,7 +44,6 @@ function cleanupKernel(kernel, closeChannels) {
console.warn(`Could not cleanup kernel channels, have they already
been completed?`, kernel.channels);
}
- delete kernel.channels;
}
if (kernel.spawn) {
@@ -57,11 +56,9 @@ function cleanupKernel(kernel, closeChannels) {
console.warn(`Could not cleanup kernel process stdio, have they already
been destoryed?`, kernel.spawn);
}
- delete kernel.spawn;
}
if (kernel.connectionFile) {
fs.unlinkSync(kernel.connectionFile);
- delete kernel.connectionFile;
}
}
@@ -71,6 +68,12 @@ export function forceShutdownKernel(kernel) {
}
cleanupKernel(kernel, true);
+
+ // TODO: Refactor to either return a new blank kernel "reduction" or how we do this
+
+ delete kernel.channels; // eslint-disable-line
+ delete kernel.spawn; // eslint-disable-line
+ delete kernel.connectionFile; // eslint-disable-line
}
export function shutdownKernel(kernel) { | Move kernel deletion to one spot, mark TODO | nteract_nteract | train | js |
39c0ee97311a9d33be8bed2c07ade0424c8fa42f | diff --git a/hwt/serializer/systemC/utils.py b/hwt/serializer/systemC/utils.py
index <HASH>..<HASH> 100644
--- a/hwt/serializer/systemC/utils.py
+++ b/hwt/serializer/systemC/utils.py
@@ -4,6 +4,7 @@ from hwt.hdl.statement import HdlStatement
from hwt.pyUtils.arrayQuery import arr_any
from ipCorePackager.constants import DIRECTION
from hdlConvertor.hdlAst._defs import HdlVariableDef
+from hwt.synthesizer.param import Param
def systemCTypeOfSig(s):
@@ -24,7 +25,8 @@ def systemCTypeOfSig(s):
return SIGNAL_TYPE.PORT_REG
else:
raise ValueError(t)
-
+ elif isinstance(s, Param):
+ return SIGNAL_TYPE.PORT_REG
elif s._const or\
arr_any(s.drivers,
lambda d: isinstance(d, HdlStatement) | systemCTypeOfSig: support for Param | Nic30_hwt | train | py |
c33cbd78a671c0cf27a4272de01486fbe89abd5f | diff --git a/lib/incoming_form.js b/lib/incoming_form.js
index <HASH>..<HASH> 100644
--- a/lib/incoming_form.js
+++ b/lib/incoming_form.js
@@ -361,11 +361,12 @@ IncomingForm.prototype._initUrlencoded = function() {
IncomingForm.prototype._initOctetStream = function() {
this.type = 'octet-stream';
var filename = this.headers['x-file-name'];
+ var mime = this.headers['content-type'];
var file = new File({
path: this._uploadPath(filename),
name: filename,
- type: ''
+ type: mime
}); | add mime to file type for octet-stream content-type | pillarjs_multiparty | train | js |
7e059ba8dc654418fee48d64e10de20bce3637d3 | diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,7 +19,14 @@ extensions = [
# Uncomment the below if you use native CircuitPython modules such as
# digitalio, micropython and busio. List the modules you use. Without it, the
# autodoc module docs will fail to generate with a warning.
-autodoc_mock_imports = ["machine", "Adafruit_GPIO", "RPi", "RPi.GPIO", "hid", "sysv_ipc"]
+autodoc_mock_imports = [
+ "machine",
+ "Adafruit_GPIO",
+ "RPi",
+ "RPi.GPIO",
+ "hid",
+ "sysv_ipc",
+]
intersphinx_mapping = {
"python": ("https://docs.python.org/3.4", None),
diff --git a/src/pulseio.py b/src/pulseio.py
index <HASH>..<HASH> 100644
--- a/src/pulseio.py
+++ b/src/pulseio.py
@@ -30,4 +30,4 @@ elif detector.board.greatfet_one:
elif "sphinx" in sys.modules:
pass
else:
- raise NotImplementedError("pulseio not supported for this board.")
\ No newline at end of file
+ raise NotImplementedError("pulseio not supported for this board.") | Add missing modules to API docs build.
Includes tweaks to Sphinx config and module files to help the docs build.
Reviewed the docs build with:
sphinx-build -E -W -b html . _build/html | adafruit_Adafruit_Blinka | train | py,py |
2d26c686875d856653cffe731444e091ba7da681 | diff --git a/lxd/instance/drivers/load.go b/lxd/instance/drivers/load.go
index <HASH>..<HASH> 100644
--- a/lxd/instance/drivers/load.go
+++ b/lxd/instance/drivers/load.go
@@ -62,7 +62,7 @@ func load(s *state.State, args db.InstanceArgs, profiles []api.Profile) (instanc
}
// validDevices validate instance device configs.
-func validDevices(state *state.State, cluster *db.Cluster, projectName string, instanceType instancetype.Type, devices deviceConfig.Devices, expanded bool) error {
+func validDevices(state *state.State, projectName string, instanceType instancetype.Type, devices deviceConfig.Devices, expanded bool) error {
// Empty device list
if devices == nil {
return nil | lxd/instance/drivers/load: Removes unused cluster arg from validDevices | lxc_lxd | train | go |
f39fe7821815b56482f3619047f0821982f43a53 | diff --git a/codado/_version.py b/codado/_version.py
index <HASH>..<HASH> 100644
--- a/codado/_version.py
+++ b/codado/_version.py
@@ -1,2 +1,2 @@
-__version__ = "0.4.991"
+__version__ = "0.4.994"
__all__ = ["__version__"]
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,12 @@
from setuptools import setup
+from pip.req import parse_requirements
+
from codado import _version
+
+reqs = parse_requirements('requirements.txt')
+
setup(
name = 'Codado',
packages = ['codado', 'codado.kleinish'],
@@ -13,4 +18,5 @@ setup(
keywords = ['twisted', 'utility'],
classifiers = [],
scripts = ['bin/urltool', 'bin/jentemplate'],
+ install_requires=list(reqs)
) | <I> cleaning up requirements mess | corydodt_Codado | train | py,py |
37f4399ab4b4a1d3ae68390f47e8eb8b5edd3d62 | diff --git a/h5p.classes.php b/h5p.classes.php
index <HASH>..<HASH> 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -67,7 +67,13 @@ interface H5PFrameworkInterface {
*/
public function t($message, $replacements = array());
- public function getLibraryFilePath($library_folder, $file);
+ /**
+ * Get URL to file in the specific library
+ * @param string $libraryFolderName
+ * @param string $fileName
+ * @return string URL to file
+ */
+ public function getLibraryFileUrl($libraryFolderName, $fileName);
/**
* Get the Path to the last uploaded h5p | Added interface function that returns library file URL [HFP-<I>] | h5p_h5p-php-library | train | php |
f64d409c902f565fdfab42de45bfac38a69e1aa6 | diff --git a/version/version.go b/version/version.go
index <HASH>..<HASH> 100644
--- a/version/version.go
+++ b/version/version.go
@@ -17,7 +17,7 @@ import (
// The presence and format of this constant is very important.
// The debian/rules build recipe uses this value for the version
// number of the release package.
-const version = "1.9.8"
+const version = "1.9.9"
// Current gives the current version of the system. If the file
// "FORCE-VERSION" is present in the same directory as the running | set development version to <I> | juju_juju | train | go |
323ceaade2077da47cfdd8dc54bf757f0b940682 | diff --git a/src/Sylius/Component/Resource/Repository/InMemoryRepository.php b/src/Sylius/Component/Resource/Repository/InMemoryRepository.php
index <HASH>..<HASH> 100644
--- a/src/Sylius/Component/Resource/Repository/InMemoryRepository.php
+++ b/src/Sylius/Component/Resource/Repository/InMemoryRepository.php
@@ -167,7 +167,7 @@ class InMemoryRepository implements RepositoryInterface
$resources = $this->findAll();
if (!empty($sorting)) {
- $resources = $this->applyOrder($resources, $orderBy);
+ $resources = $this->applyOrder($resources, $sorting);
}
if (!empty($criteria)) {
diff --git a/src/Sylius/Component/Resource/Repository/RepositoryInterface.php b/src/Sylius/Component/Resource/Repository/RepositoryInterface.php
index <HASH>..<HASH> 100644
--- a/src/Sylius/Component/Resource/Repository/RepositoryInterface.php
+++ b/src/Sylius/Component/Resource/Repository/RepositoryInterface.php
@@ -25,7 +25,7 @@ interface RepositoryInterface extends ObjectRepository
/**
* @param array $criteria
- * @param array $orderBy
+ * @param array $sorting
*
* @return mixed
*/ | [Resource] RepositoryInterface cleanup | Sylius_Sylius | train | php,php |
a8fcf50e558d7c9f47c8462917c06c336b3acade | diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php
index <HASH>..<HASH> 100644
--- a/mod/chat/gui_ajax/index.php
+++ b/mod/chat/gui_ajax/index.php
@@ -84,6 +84,7 @@ $PAGE->requires->js_init_call('M.mod_chat_ajax.init', array($modulecfg), false,
$PAGE->set_title(get_string('modulename', 'chat').": $courseshortname: ".format_string($chat->name, true)."$groupname");
$PAGE->add_body_class('yui-skin-sam');
+$PAGE->activityheader->disable();
$PAGE->set_pagelayout('embedded');
if ( $theme != 'course_theme') {
$PAGE->requires->css('/mod/chat/gui_ajax/theme/'.$theme.'/chat.css'); | MDL-<I> mod_chat: disable activity header in ajax chat interface | moodle_moodle | train | php |
7f19ae444e15b74f2d506f55ded4747d9f43b0a2 | diff --git a/rabird/filesystem.py b/rabird/filesystem.py
index <HASH>..<HASH> 100644
--- a/rabird/filesystem.py
+++ b/rabird/filesystem.py
@@ -63,8 +63,7 @@ class path_t(rabird.compatible.unicode_t):
return self.__path
def __div__(self, rhs):
- self.__path = os.path.join(self.__path, unicode(rhs))
- return self
+ return os.path.join(self.__path, unicode(rhs))
def clear(self):
self.__path = u"" | Fixed div operation will change path_t object | starofrainnight_rabird.core | train | py |
5a8135d9e496b5358bc29bae79538cabad2cca13 | diff --git a/src/renderer/dataframe/Dataframe.js b/src/renderer/dataframe/Dataframe.js
index <HASH>..<HASH> 100644
--- a/src/renderer/dataframe/Dataframe.js
+++ b/src/renderer/dataframe/Dataframe.js
@@ -152,12 +152,14 @@ export default class Dataframe extends DummyDataframe {
}
getPropertyTexture (propertyName) {
- if (this.propertyTex[propertyName]) {
- return this.propertyTex[propertyName];
+ const encodedPropertyName = `_${propertyName}`;
+
+ if (this.propertyTex[encodedPropertyName]) {
+ return this.propertyTex[encodedPropertyName];
}
- this._loadPropertyValuesToTexture(propertyName);
- return this.propertyTex[propertyName];
+ this._loadPropertyValuesToTexture(encodedPropertyName);
+ return this.propertyTex[encodedPropertyName];
}
/** | Encode property name. Allow using "length" | CartoDB_carto-vl | train | js |
8a334892152baaa3f2bbdfa366d09c3bb71bac80 | diff --git a/src/libraries/default/application/template/helper/less/less.php b/src/libraries/default/application/template/helper/less/less.php
index <HASH>..<HASH> 100755
--- a/src/libraries/default/application/template/helper/less/less.php
+++ b/src/libraries/default/application/template/helper/less/less.php
@@ -75,7 +75,8 @@ class LibApplicationTemplateHelperLess extends KTemplateHelperAbstract
if ( is_array($cache) )
{
foreach($config['import'] as $path) {
- if ( filemtime($path) > $cache['updated'] ) {
+ if ( is_readable($path) &&
+ filemtime($path) > $cache['updated'] ) {
$force = true;
break;
}
@@ -96,7 +97,10 @@ class LibApplicationTemplateHelperLess extends KTemplateHelperAbstract
//store the cache
file_put_contents($cache_file, serialize($new_cache));
//store the compiled file
-
+ //create a directory if
+ if ( !file_exists(dirname($config->output)) ) {
+ mkdir(dirname($config->output), 0755);
+ }
file_put_contents($config->output, $new_cache['compiled']);
}
} | the less compile check if the output folder doesn't exists it creates it | anahitasocial_anahita | train | php |
9f61b7656a00440d4f1ab493ba7f453f6a3db718 | diff --git a/spec/thinking_sphinx/active_record/index_spec.rb b/spec/thinking_sphinx/active_record/index_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/thinking_sphinx/active_record/index_spec.rb
+++ b/spec/thinking_sphinx/active_record/index_spec.rb
@@ -5,7 +5,9 @@ require 'spec_helper'
describe ThinkingSphinx::ActiveRecord::Index do
let(:index) { ThinkingSphinx::ActiveRecord::Index.new :user }
let(:config) { double('config', :settings => {},
- :indices_location => 'location', :next_offset => 8) }
+ :indices_location => 'location', :next_offset => 8,
+ :index_set_class => index_set_class) }
+ let(:index_set_class) { double :reference_name => :user }
before :each do
allow(ThinkingSphinx::Configuration).to receive_messages :instance => config | test: Allow for index_set_class call.
I don't know why this was an issue on my machine, but not in CI. | pat_thinking-sphinx | train | rb |
2e858fe055eba52873957826e30209b03d34d641 | diff --git a/lib/pushapp/hook.rb b/lib/pushapp/hook.rb
index <HASH>..<HASH> 100644
--- a/lib/pushapp/hook.rb
+++ b/lib/pushapp/hook.rb
@@ -110,7 +110,7 @@ module Pushapp
end
def set_setup_flag
- @remote.run "touch .git/.pushapp.setup.flag"
+ @remote.run "touch #{@remote.path}/.git/.pushapp.setup.flag"
end
def copy_hook | Full path to .pushapp.setup.flag | anjlab_pushapp | train | rb |
36b74ec826245476ee2a4d40fd0252fa098effaf | diff --git a/auto_ml/DataFrameVectorizer.py b/auto_ml/DataFrameVectorizer.py
index <HASH>..<HASH> 100644
--- a/auto_ml/DataFrameVectorizer.py
+++ b/auto_ml/DataFrameVectorizer.py
@@ -116,6 +116,9 @@ class DataFrameVectorizer(BaseEstimator, TransformerMixin):
if str(val) in bad_vals_as_strings:
val = '_None'
val = self.get('label_encoders')[f].transform([val])
+
+ if f in vocab and str(val) not in bad_vals_as_strings:
+
indices.append(vocab[f])
# Convert the val to the correct dtype, then append to our values list
values.append(dtype(val)) | fixes bug, appends all valid results to output | ClimbsRocks_auto_ml | train | py |
f54f506b34e2b3fd4b5350dd47f61b6459771e46 | diff --git a/src/sagemaker/amazon/amazon_estimator.py b/src/sagemaker/amazon/amazon_estimator.py
index <HASH>..<HASH> 100644
--- a/src/sagemaker/amazon/amazon_estimator.py
+++ b/src/sagemaker/amazon/amazon_estimator.py
@@ -538,7 +538,7 @@ def get_image_uri(region_name, repo_name, repo_version=1):
"There is a more up to date SageMaker XGBoost image."
"To use the newer image, please set 'repo_version'="
"'0.90-1. For example:\n"
- "\tget_image_uri(region, 'xgboost', %s).",
+ "\tget_image_uri(region, 'xgboost', '%s').",
XGBOOST_LATEST_VERSION,
)
repo = "{}:{}".format(repo_name, repo_version) | fix: Fix get_image_uri warning log for default xgboost version. (#<I>) | aws_sagemaker-python-sdk | train | py |
858d4034f002e358b6e9c0515fa4226610294c46 | diff --git a/src/UrlGenerator.php b/src/UrlGenerator.php
index <HASH>..<HASH> 100644
--- a/src/UrlGenerator.php
+++ b/src/UrlGenerator.php
@@ -51,10 +51,11 @@ class UrlGenerator extends \Illuminate\Routing\UrlGenerator
}
/**
+ * Compartilhar valor de parametro.
* @param $name
* @param $value
*/
- public function addParametersContext($name, $value)
+ public function share($name, $value)
{
$this->parametersContext[$name] = $value;
} | urlgenerator with param context | bugotech_http | train | php |
0eef4cb03ac699fe2b3fab2ee9ccfd271f529ffd | diff --git a/fastlane/lib/fastlane/lane_manager.rb b/fastlane/lib/fastlane/lane_manager.rb
index <HASH>..<HASH> 100644
--- a/fastlane/lib/fastlane/lane_manager.rb
+++ b/fastlane/lib/fastlane/lane_manager.rb
@@ -233,11 +233,16 @@ module Fastlane
[key, content.to_s]
end
- require 'terminal-table'
- puts Terminal::Table.new({
- title: "Lane Context".yellow,
- rows: FastlaneCore::PrintTable.transform_output(rows)
- })
+ begin
+ require 'terminal-table'
+ puts Terminal::Table.new({
+ title: "Lane Context".yellow,
+ rows: FastlaneCore::PrintTable.transform_output(rows)
+ })
+ rescue
+ os = Helper.linux? ? 'linux' : 'mac'
+ UI.crash!("Something went wrong trying to print the lane context on #{os}")
+ end
end
end
end | Fix puts crash on linux (#<I>) | fastlane_fastlane | train | rb |
2cc218f090b5678bb6c37429bc61136e0603aaa4 | diff --git a/lib/kamerling/client.rb b/lib/kamerling/client.rb
index <HASH>..<HASH> 100644
--- a/lib/kamerling/client.rb
+++ b/lib/kamerling/client.rb
@@ -1,8 +1,2 @@
module Kamerling class Client < UUIDObject :addr, busy: false
- def self.from_h hash
- hash.merge! addr: Addr[hash[:host], hash[:port]]
- hash.delete :host
- hash.delete :port
- new hash
- end
end end
diff --git a/spec/kamerling/client_spec.rb b/spec/kamerling/client_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/kamerling/client_spec.rb
+++ b/spec/kamerling/client_spec.rb
@@ -1,10 +1,4 @@
require_relative '../spec_helper'
module Kamerling describe Client do
- describe '.from_h' do
- it 'backtranslates host and port to addr' do
- Client.from_h(host: '127.0.0.1', port: 1981).addr
- .must_equal Addr['127.0.0.1', 1981]
- end
- end
end end | Client.from_h: no need to custom-deserialise host and port | chastell_kamerling | train | rb,rb |
94d52e27e1050423e746bdc8fde6454247c9709a | diff --git a/concrete/views/panels/add/get_stack_contents.php b/concrete/views/panels/add/get_stack_contents.php
index <HASH>..<HASH> 100644
--- a/concrete/views/panels/add/get_stack_contents.php
+++ b/concrete/views/panels/add/get_stack_contents.php
@@ -29,7 +29,7 @@ $blockPreviewUrl = URL::to('/ccm/system/block/preview');
<span class="handle"><?= h($type->getBlockTypeName()) ?></span>
</div>
<div class="embed-responsive embed-responsive-4by3 block-content">
- <iframe src="<?= $blockPreviewUrl->setQuery(['bID' => $block->getBlockID(), 'sID' => $stack->getCollectionID(), 'cID' => 1]); ?>"
+ <iframe src="<?= $blockPreviewUrl->setQuery(['bID' => $block->getBlockID(), 'sID' => $stack->getCollectionID(), 'cID' => $c->getCollectionID()]); ?>"
scrolling="no" frameborder="0" allowfullscreen></iframe>
</div>
<div class="block-handle"></div> | Pass current page id to block preview to detect its theme | concrete5_concrete5 | train | php |
cf1354bb899726e17eaaf1df504c280b3e56f3d0 | diff --git a/git/config.py b/git/config.py
index <HASH>..<HASH> 100644
--- a/git/config.py
+++ b/git/config.py
@@ -339,8 +339,7 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje
if PY3:
return v.encode(defenc).decode('unicode_escape')
- else:
- return v.decode('string_escape')
+ return v.decode('string_escape')
# end
# end | removed Unnecessary “else” after “return” | gitpython-developers_GitPython | train | py |
e3a5e26a9ea9d54831b6de5fc5a6acb2ac602979 | diff --git a/lib/puppet/util/windows/taskscheduler.rb b/lib/puppet/util/windows/taskscheduler.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/util/windows/taskscheduler.rb
+++ b/lib/puppet/util/windows/taskscheduler.rb
@@ -268,18 +268,12 @@ module Win32
def save(file = nil)
raise Error.new('No currently active task. ITask is NULL.') if @pITask.nil?
- pIPersistFile = nil
begin
- FFI::MemoryPointer.new(:pointer) do |ptr|
- @pITask.QueryInterface(IID_IPersistFile, ptr)
- pIPersistFile = COM::PersistFile.new(ptr.read_pointer)
+ @pITask.QueryInstance(COM::PersistFile) do |pIPersistFile|
+ pIPersistFile.Save(wide_string(file), 1)
end
-
- pIPersistFile.Save(wide_string(file), 1)
ensure
- pIPersistFile.Release if pIPersistFile && !pIPersistFile.null?
-
@pITS = COM::TaskScheduler.new
@pITask.Release | (PUP-<I>) Use COM interface pointer helper
- Rather than using QueryInterface directly, use the QueryInstance
helper to return a COM interface pointer in a block and call
Release as soon as the block has completed. Note that QueryInstance
handles allocation of a temporary pointer to hold the COM interface
pointer that must be dereferenced. | puppetlabs_puppet | train | rb |
356cf82af5becf5f64c3c0a1a2ded65f8fd0c366 | diff --git a/broker/http_broker.go b/broker/http_broker.go
index <HASH>..<HASH> 100644
--- a/broker/http_broker.go
+++ b/broker/http_broker.go
@@ -276,12 +276,16 @@ func (h *httpBroker) Address() string {
}
func (h *httpBroker) Connect() error {
- h.Lock()
- defer h.Unlock()
+ h.RLock()
if h.running {
+ h.RUnlock()
return nil
}
+ h.RUnlock()
+
+ h.Lock()
+ defer h.Unlock()
var l net.Listener
var err error
@@ -351,12 +355,16 @@ func (h *httpBroker) Connect() error {
}
func (h *httpBroker) Disconnect() error {
- h.Lock()
- defer h.Unlock()
+ h.RLock()
if !h.running {
+ h.RUnlock()
return nil
}
+ h.RUnlock()
+
+ h.Lock()
+ defer h.Unlock()
// stop rcache
rc, ok := h.r.(rcache.Cache)
@@ -375,12 +383,15 @@ func (h *httpBroker) Disconnect() error {
}
func (h *httpBroker) Init(opts ...Option) error {
- h.Lock()
- defer h.Unlock()
-
+ h.RLock()
if h.running {
+ h.RUnlock()
return errors.New("cannot init while connected")
}
+ h.RUnlock()
+
+ h.Lock()
+ defer h.Unlock()
for _, o := range opts {
o(&h.opts) | Fixing httpBroker dead lock; If publish is called from a subscription | micro_go-micro | train | go |
864195c4d260c32ccd85d1faeddee01515c52fe6 | diff --git a/index/scorch/scorch.go b/index/scorch/scorch.go
index <HASH>..<HASH> 100644
--- a/index/scorch/scorch.go
+++ b/index/scorch/scorch.go
@@ -566,6 +566,10 @@ func (s *Scorch) StatsMap() map[string]interface{} {
return m
}
+func (s *Scorch) Analyze(d index.Document) {
+ analyze(d)
+}
+
func analyze(d index.Document) {
d.VisitFields(func(field index.Field) {
if field.Options().IsIndexed() {
diff --git a/index/upsidedown/analysis.go b/index/upsidedown/analysis.go
index <HASH>..<HASH> 100644
--- a/index/upsidedown/analysis.go
+++ b/index/upsidedown/analysis.go
@@ -33,6 +33,10 @@ type AnalysisResult struct {
Rows []IndexRow
}
+func (udc *UpsideDownCouch) Analyze(d index.Document) *AnalysisResult {
+ return udc.analyze(d)
+}
+
func (udc *UpsideDownCouch) analyze(d index.Document) *AnalysisResult {
rv := &AnalysisResult{
DocID: d.ID(), | Adding back exported Analyze(..) APIs for scorch & upsidedown
Note that these APIs have different signatures for the two. | blevesearch_bleve | train | go,go |
a6fe9bfccf9d332dbc5610a3fb537d8a4dd9b725 | diff --git a/tests/KoineTests/TableHelper/TableHelperTest.php b/tests/KoineTests/TableHelper/TableHelperTest.php
index <HASH>..<HASH> 100644
--- a/tests/KoineTests/TableHelper/TableHelperTest.php
+++ b/tests/KoineTests/TableHelper/TableHelperTest.php
@@ -86,7 +86,8 @@ class TableHelperTest extends DbTestCase
'value' => 'someValue',
));
- $id = $this->getRecords(array())[0]['id'];
+ $records = $this->getRecords(array());
+ $id = $records[0]['id'];
$expected = array(
'id' => $id,
@@ -161,7 +162,8 @@ class TableHelperTest extends DbTestCase
'value' => 'someValue',
));
- $id = $this->getRecords(array())[0]['id'];
+ $records = $this->getRecords(array());
+ $id = $records[0]['id'];
$this->object->update($id, array(
'name' => 'updated name', | Fixed tests for older versions of php | koinephp_DbTestCase | train | php |
5b7625ba06afacade70d52f1c8300fbf8ff2291b | diff --git a/ordlookup/__init__.py b/ordlookup/__init__.py
index <HASH>..<HASH> 100644
--- a/ordlookup/__init__.py
+++ b/ordlookup/__init__.py
@@ -9,24 +9,23 @@ infoz.
'''
ords = {
- b'ws2_32.dll':ws2_32.ord_names,
- b'wsock32.dll':ws2_32.ord_names,
- b'oleaut32.dll':oleaut32.ord_names,
+ b'ws2_32.dll': ws2_32.ord_names,
+ b'wsock32.dll': ws2_32.ord_names,
+ b'oleaut32.dll': oleaut32.ord_names,
}
+
def ordLookup(libname, ord, make_name=False):
'''
Lookup a name for the given ordinal if it's in our
database.
'''
names = ords.get(libname.lower())
- if names == None:
+ if names is None:
if make_name is True:
- return 'ord%d' % ord
+ return b'ord%d' % ord
return None
name = names.get(ord)
- if name == None:
- return 'ord%d' % ord
+ if name is None:
+ return b'ord%d' % ord
return name
-
- | bytes vs str strikes again | erocarrera_pefile | train | py |
8adffe2953a254163ab69e6d301aa6e8f13a31cf | diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index <HASH>..<HASH> 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -10,11 +10,7 @@
*/
namespace Piwik\Plugins\Live;
-
-use Piwik\Common;
use Piwik\Menu\MenuMain;
-use Piwik\Piwik;
-use Piwik\Plugin\ViewDataTable;
use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
use Piwik\WidgetsList;
@@ -79,4 +75,6 @@ class Live extends \Piwik\Plugin
{
$defaultViewTypes['Live.getLastVisitsDetails'] = VisitorLog::ID;
}
-}
\ No newline at end of file
+}
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/Live/VisitorLog.php';
\ No newline at end of file | refs #<I> always include VisitorLog file, maybe there is an autoloader issue | matomo-org_matomo | train | php |
ba9e0ee43f0936eb6ea611a1ad1ccb4d35a66d77 | diff --git a/lib/Widget/Widget.php b/lib/Widget/Widget.php
index <HASH>..<HASH> 100644
--- a/lib/Widget/Widget.php
+++ b/lib/Widget/Widget.php
@@ -320,10 +320,8 @@ class Widget extends WidgetProvider
// Trigger the construct callback
$this->construct && call_user_func($this->construct, $name, $full);
- // FIXME widget option should be set first
- // Load the widget configuration
- $options = (array)$this->config($full);
- $options['widget'] = $this;
+ // Load the widget configuration and make sure "widget" option at first
+ $options = array('widget' => $this) + (array)$this->config($full);
$this->widgets[$lower] = new $class($options); | fixed widget option not at the top of array issue | twinh_wei | train | php |
34c11466284f42fbbfc630ac11fcc85476a97f12 | diff --git a/opal/clearwater/component.rb b/opal/clearwater/component.rb
index <HASH>..<HASH> 100644
--- a/opal/clearwater/component.rb
+++ b/opal/clearwater/component.rb
@@ -56,7 +56,7 @@ module Clearwater
def to_html(renderer: renderer)
renderer.add_events events
- "<#@tag_name id=#{element_id.inspect} class=#{@class_name.inspect}>#{inner_html}</#@tag_name>"
+ "<#@tag_name id=#{element_id.inspect} class=#{@class_name.inspect}>#{inner_html(renderer: renderer)}</#@tag_name>"
end
def to_s | Reuse the same renderer
This was happening in the usual case anyway, but if a component was
rerendering itself (using the `render` method) with a renderer passed
in, it was not actually getting rendered using that renderer. | clearwater-rb_clearwater | train | rb |
f590cfbe6af1eebc3b7cd6c0397dee1b02ec370c | diff --git a/src/SavedSearches/FixedSavedSearchRepository.php b/src/SavedSearches/FixedSavedSearchRepository.php
index <HASH>..<HASH> 100644
--- a/src/SavedSearches/FixedSavedSearchRepository.php
+++ b/src/SavedSearches/FixedSavedSearchRepository.php
@@ -21,7 +21,6 @@ class FixedSavedSearchRepository implements SavedSearchRepositoryInterface
public function __construct(\CultureFeed_User $user)
{
$this->user = $user;
- $this->emailAddress = new EmailAddress($user->mbox);
}
/**
@@ -40,7 +39,8 @@ class FixedSavedSearchRepository implements SavedSearchRepositoryInterface
protected function getCreatedByCurrentUserSearch()
{
$name = new String('Door mij ingevoerd');
- $query = new CreatedByQueryString($this->emailAddress);
+ $emailAddress = new EmailAddress($this->user->mbox);
+ $query = new CreatedByQueryString($emailAddress);
return new SavedSearch($name, $query);
} | III-<I> Update FixedSavedSearchRepository to allow for empty CulturefeedUser | cultuurnet_udb3-php | train | php |
aa8b31cad160a67fe6cc6e330db7d0b65d1823be | diff --git a/lib/assets.js b/lib/assets.js
index <HASH>..<HASH> 100644
--- a/lib/assets.js
+++ b/lib/assets.js
@@ -1037,11 +1037,11 @@ module.exports = {
var stylesheets;
if (self._minified[cacheKey] && self._minified[cacheKey]['stylesheets']) {
- // Use cached upgrade if it was calculated at startup
+ // Use cached CSS if it was calculated at startup
result.css = self._minified[cacheKey]['stylesheets'];
} else if (self._lessMasters && self._lessMasters[cacheKey]) {
// Use a master LESS file if it was created at startup
- stylesheets = self._lessMasters[cacheKey];
+ stylesheets = [ self._lessMasters[cacheKey] ];
} else {
stylesheets = self.filterAssets(self._assets['stylesheets'], cacheKey);
} | Whoops, need to wrap the CSS master as an array. Fixes apostrophe-moderator styles | apostrophecms_apostrophe | train | js |
7e69b13673ab0961320d325d066a5230d36f50e0 | diff --git a/go/teams/request_test.go b/go/teams/request_test.go
index <HASH>..<HASH> 100644
--- a/go/teams/request_test.go
+++ b/go/teams/request_test.go
@@ -84,8 +84,6 @@ func TestAccessRequestAccept(t *testing.T) {
}
func TestAccessRequestIgnore(t *testing.T) {
- t.Skip()
-
tc, owner, u1, _, teamName := memberSetupMultiple(t)
defer tc.Cleanup()
@@ -109,6 +107,7 @@ func TestAccessRequestIgnore(t *testing.T) {
}); err != nil {
t.Fatal(err)
}
+ require.NoError(t, tc.G.UIDMapper.ClearUIDFullName(context.Background(), tc.G, u1.User.GetUID()))
// owner lists requests, sees u1 request
err = tc.Logout() | TAR flake fix (#<I>) | keybase_client | train | go |
6b21a07bc26aef5f88cb2a251971121ea163d703 | diff --git a/flask_appbuilder/filters.py b/flask_appbuilder/filters.py
index <HASH>..<HASH> 100755
--- a/flask_appbuilder/filters.py
+++ b/flask_appbuilder/filters.py
@@ -78,7 +78,10 @@ class TemplateFilters(object):
lnkstr = path
for flt, value in filters.get_filters_values():
if flt.is_related_view:
- lnkstr = lnkstr + '&_flt_0_' + flt.column_name + '=' + str(value)
+ if '?' in lnkstr:
+ lnkstr = lnkstr + '&_flt_0_' + flt.column_name + '=' + str(value)
+ else:
+ lnkstr = lnkstr + '?_flt_0_' + flt.column_name + '=' + str(value)
return lnkstr
@app_template_filter('get_link_order') | set link filter update, args already exists check | dpgaspar_Flask-AppBuilder | train | py |
a4957c2c569d5fdffc7c2f80a48dbbdfff6a8127 | diff --git a/etc/eslint/rules/stdlib.js b/etc/eslint/rules/stdlib.js
index <HASH>..<HASH> 100644
--- a/etc/eslint/rules/stdlib.js
+++ b/etc/eslint/rules/stdlib.js
@@ -2600,7 +2600,6 @@ rules[ 'stdlib/require-globals' ] = [ 'error', {
*/
rules[ 'stdlib/require-order' ] = [ 'error', {
'order': [
- '/^tape$/',
'builtin',
'external',
'/^@stdlib/', | Update `require` order | stdlib-js_stdlib | train | js |
38f7d53209207613f61e77278282185807e50758 | diff --git a/test/run_all.rb b/test/run_all.rb
index <HASH>..<HASH> 100644
--- a/test/run_all.rb
+++ b/test/run_all.rb
@@ -2,20 +2,19 @@ def bundle_check
`bundle check` == "Resolving dependencies...\nThe Gemfile's dependencies are satisfied\n"
end
-command = 'ruby -w -Ilib -Itest test/all.rb'
+def execute(command)
+ puts command
+ system command
+end
+
gemfiles = %w(Gemfile) + Dir['gemfiles/Gemfile*'].reject { |f| f.end_with?('.lock') }
results = gemfiles.map do |gemfile|
- puts "BUNDLE_GEMFILE=#{gemfile}"
+ puts "\nBUNDLE_GEMFILE=#{gemfile}"
ENV['BUNDLE_GEMFILE'] = File.expand_path("../../#{gemfile}", __FILE__)
- unless bundle_check
- puts "bundle install"
- system('bundle install')
- end
-
- puts command
- system command
+ execute 'bundle install' unless bundle_check
+ execute 'bundle exec ruby -w -Ilib -Itest test/all.rb'
end
-exit(results.inject(true) { |a, b| a && b })
+exit results.all? | Use bundle exec when running tests for all gemfiles
Refactor script a bit, improve output. | ruby-i18n_i18n | train | rb |
0a30976b547a11cf3a4852f5da0a2d8abae48cbe | diff --git a/src/ServiceBindings.php b/src/ServiceBindings.php
index <HASH>..<HASH> 100644
--- a/src/ServiceBindings.php
+++ b/src/ServiceBindings.php
@@ -9,7 +9,7 @@ trait ServiceBindings
*
* @var array
*/
- protected $bindings = [
+ public $bindings = [
// General services...
AutoScaler::class,
Contracts\HorizonCommandQueue::class => RedisHorizonCommandQueue::class, | Laravel <I> expects the `ServiceProvider::$bindings` to be public | laravel_horizon | train | php |
Subsets and Splits