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
4d55fa13f8b21f239f9c8251504215be20fa59b1
diff --git a/firenado/__init__.py b/firenado/__init__.py index <HASH>..<HASH> 100644 --- a/firenado/__init__.py +++ b/firenado/__init__.py @@ -22,4 +22,4 @@ from __future__ import (absolute_import, division, print_function, with_statement) -__version__ = (0, 1, 0, 0) +__version__ = (0, 1, 0) diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -32,8 +32,8 @@ install_requires = [ setup( name='Firenado', - version=firenado.__version__, - description='Componentized web framework.', + version=".".join(map(str,firenado.__version__)), + description='Componentized web framework based on Tornado.', license='Apache License V2.0', author='Flavio Garcia', author_email='[email protected]',
Fixed firenado version. Removed the fourth digit from the firenado version tuple. Fixed the setup.py version error while joining the firenad version touple. Refs: #2
candango_firenado
train
py,py
a01ec9bde626c3ae498fe55f32082ea95b876b41
diff --git a/src/faker/app.js b/src/faker/app.js index <HASH>..<HASH> 100644 --- a/src/faker/app.js +++ b/src/faker/app.js @@ -29,5 +29,8 @@ export function author() { } function parseNumber(n) { - return n == '#' ? randomNumber(0, 9) : n; + (n.match(/#/g) || []).forEach(_ => { + n = n.replace(/#/, randomNumber(0, 10)); + }); + return n; } diff --git a/test/faker/app.spec.js b/test/faker/app.spec.js index <HASH>..<HASH> 100644 --- a/test/faker/app.spec.js +++ b/test/faker/app.spec.js @@ -21,7 +21,9 @@ describe('App', () => { }); it('should return a version format', () => { - expect(App.version()).to.match(/(?:#|\d+)\.(?:[#]+|\d+)(?:\.(?:[#]+|\d+))?/); + [...Array(100).keys()].forEach(_ => { + expect(App.version()).to.match(/(?:#|\d+)\.(?:[#]+|\d+)(?:\.(?:[#]+|\d+))?/); + }); }); });
Fixed issue when parsing version number.
mrstebo_fakergem
train
js,js
71aed37f5ccb5772f24c7b83d163d9a40eb147aa
diff --git a/runcommands/config.py b/runcommands/config.py index <HASH>..<HASH> 100644 --- a/runcommands/config.py +++ b/runcommands/config.py @@ -379,8 +379,10 @@ class ConfigParser(RawConfigParser): class JSONValue(str): - def __new__(cls, *args, name=None): - instance = super().__new__(cls, *args) + def __new__(cls, string, *, name=None): + if not isinstance(string, str): + raise ConfigTypeError('Expected str; got %s' % string.__class__, name) + instance = super().__new__(cls, string) instance.name = name return instance
Allow JSONValue to be constructed from str only And force name to be passed as a keyword arg.
wylee_runcommands
train
py
0c6e5a37e2ad04cb8f60c7873231e362c46d385b
diff --git a/lib/reda/importers/utils/transforms.py b/lib/reda/importers/utils/transforms.py index <HASH>..<HASH> 100644 --- a/lib/reda/importers/utils/transforms.py +++ b/lib/reda/importers/utils/transforms.py @@ -7,6 +7,10 @@ design your own. class transform_electrodes_roll_along(object): """This function shifts all electrode numbers by a fixed offset, as commonly encountered for roll-a-long measurement schemes. + + This transformation should only be used for logical abmn transformations, + i.e., in those cases were electrode positions are not available. Otherwise + roll-along should be realized using coordinate transformations. """ def __init__(self, shiftby=0): """ @@ -18,5 +22,12 @@ class transform_electrodes_roll_along(object): self.shiftby = shiftby def transform(self, data, electrodes, topography): + if electrodes is not None: + raise Exception( + 'Do not use the transform_electrodes_roll_along transform ' + + 'object if you have electrode positions!. Perform a ' + + 'roll-along alignment using the shiftby_xyz parameter of ' + + 'the importer functions.' + ) data[['a', 'b', 'm', 'n']] += self.shiftby return data, electrodes, topography
[transforms] Check that logical electrode position shifts are only applied of no electrode positions are available.
geophysics-ubonn_reda
train
py
f13cfaaa39de3b1eb4e04c0910f9b13b11934318
diff --git a/glry.js b/glry.js index <HASH>..<HASH> 100644 --- a/glry.js +++ b/glry.js @@ -30,6 +30,15 @@ extend(element.style, options); } + function cssCenter(element, width, height) { + extend(element.style, { + 'width': width + 'px', + 'height': height + 'px', + 'top': (window.innerHeight - height) / 2 + 'px', + 'left': (window.innerWidth - width) / 2 + 'px' + }); + } + function GlryTap(elm) { elm.addEventListener('touchstart', this); elm.addEventListener('touchmove', this); @@ -135,12 +144,7 @@ imageHeight /= ratio; } - extend(image.style, { - 'width': imageWidth + 'px', - 'height': imageHeight + 'px', - 'top': (window.innerHeight - imageHeight) / 2 + 'px', - 'left': (window.innerWidth - imageWidth) / 2 + 'px' - }); + cssCenter(image, imageWidth, imageHeight); }; }
Move center logic to a function.
omichelsen_glry
train
js
c6c2b5d8ab2d868bdf1ccaae0bb37493154b7d46
diff --git a/tests/test_hmac.py b/tests/test_hmac.py index <HASH>..<HASH> 100644 --- a/tests/test_hmac.py +++ b/tests/test_hmac.py @@ -6,15 +6,17 @@ import tempfile from simplekv.crypt import _HMACFileReader, VerificationException,\ HMACDecorator -from six import b +from six import b, indexbytes, int2byte import pytest class TestHMACFileReader(object): @pytest.fixture def bad_datas(self, value): - def _alter_byte(s, n): - return s[:n] + chr((ord(s[n]) + 1) % 255) + s[n + 1:] + def _alter_byte(byte_string, pos): + old_val = indexbytes(byte_string, pos) + new_byte = int2byte((old_val + 1 % 255)) + return byte_string[:pos] + new_byte + byte_string[pos + 1:] return (_alter_byte(value, i) for i in xrange(len(value))) @@ -44,15 +46,15 @@ class TestHMACFileReader(object): create_reader, chunk_sizes): # try for different read lengths for n in chunk_sizes: - data = '' + chunks = [] reader = create_reader() while True: r = reader.read(n) - if '' == r: + if not r: break - data += r + chunks.append(r) - assert data == value + assert b('').join(chunks) == value def test_manipulated_input_full_read( self, secret_key, value, bad_datas, hashfunc
Fixed more byte issues in hmac.
mbr_simplekv
train
py
1d07f08fe582a8e701abc4174173eafef8f214ff
diff --git a/api-datatypes.go b/api-datatypes.go index <HASH>..<HASH> 100644 --- a/api-datatypes.go +++ b/api-datatypes.go @@ -44,7 +44,7 @@ type ObjectInfo struct { // Collection of additional metadata on the object. // eg: x-amz-meta-*, content-encoding etc. - Metadata http.Header `json:"metadata"` + Metadata http.Header `json:"metadata" xml:"-"` // Owner name. Owner struct {
Ignore Metadata field in xml encode/decode (#<I>)
minio_minio-go
train
go
83e877024a792707b08cb2d62fd61000782daf82
diff --git a/ceph_deploy/tests/unit/hosts/test_hosts.py b/ceph_deploy/tests/unit/hosts/test_hosts.py index <HASH>..<HASH> 100644 --- a/ceph_deploy/tests/unit/hosts/test_hosts.py +++ b/ceph_deploy/tests/unit/hosts/test_hosts.py @@ -49,3 +49,7 @@ class TestGetDistro(object): def test_get_uknown(self): with raises(exc.UnsupportedPlatform): hosts._get_distro('Solaris') + + def test_get_fallback(self): + result = hosts._get_distro('Solaris', 'Debian') + assert result.__name__.endswith('debian')
a test to make sure we can fallback nicely
ceph_ceph-deploy
train
py
7c1616f4ec3fa074f056eeff0289c458cd5fe216
diff --git a/tests/test_menu_launcher.py b/tests/test_menu_launcher.py index <HASH>..<HASH> 100644 --- a/tests/test_menu_launcher.py +++ b/tests/test_menu_launcher.py @@ -30,6 +30,7 @@ def test_run_plugins(): invalid_dirs = test_env.PathDirs(base_dir="/tmp/") menu_launcher.run_plugins(path_dirs, "start") menu_launcher.run_plugins(invalid_dirs, "start") + test_env.initconfigs(path_dirs, False) ### Visualization Test ### # Find modes.template
init of templates seems not to have executed. manually executing.
CyberReboot_vent
train
py
adabe941930b05fe783b05c229f12c9b8888028a
diff --git a/Kwc/Box/HomeLink/Component.php b/Kwc/Box/HomeLink/Component.php index <HASH>..<HASH> 100644 --- a/Kwc/Box/HomeLink/Component.php +++ b/Kwc/Box/HomeLink/Component.php @@ -5,7 +5,7 @@ class Kwc_Box_HomeLink_Component extends Kwc_Abstract { $ret = parent::getSettings(); $ret['cssClass'] = 'webStandard'; - $ret['placeholder']['linkText'] = trlKwf('Home'); + $ret['placeholder']['linkText'] = trlKwfStatic('Home'); return $ret; }
placeholder uses trlKwfStatic for full language support
koala-framework_koala-framework
train
php
13c37926e96b643fc37e917d0354ec22083377ca
diff --git a/Classes/Domain/Model/Query.php b/Classes/Domain/Model/Query.php index <HASH>..<HASH> 100644 --- a/Classes/Domain/Model/Query.php +++ b/Classes/Domain/Model/Query.php @@ -336,7 +336,7 @@ class Tx_Pazpar2_Domain_Model_Query extends Tx_Extbase_DomainObject_AbstractEnti if ($showReply) { $status = $showReply['status'][0]['values'][0]; - $totalResultCount = $showReply['total'][0]['values'][0]; + $totalResultCount = $showReply['merged'][0]['values'][0]; if ($status == 'OK') { $this->queryIsRunning = False; $hits = $showReply['hit'];
use number of merged records rather than total number
subugoe_typo3-pazpar2
train
php
b483d08cb51c3ca7439bb58fe6cdb143be9a0fa3
diff --git a/src/Downloader/MaxMindDownloader.php b/src/Downloader/MaxMindDownloader.php index <HASH>..<HASH> 100644 --- a/src/Downloader/MaxMindDownloader.php +++ b/src/Downloader/MaxMindDownloader.php @@ -73,13 +73,12 @@ class MaxMindDownloader implements Downloader // decompress gz file $zip = new \PharData($tmp_zip); - $zip->decompress(); + $tar = $zip->decompress(); $this->logger->debug('Decompression complete'); $this->logger->debug(sprintf('Extract tar file to %s', $tmp_untar)); // extract tar archive - $tar = new \PharData($tmp_unzip); $tar->extractTo($tmp_untar); $this->logger->debug('Tar archive extracted');
try fix error on extract tar archive
gpslab_geoip2
train
php
22985445b182785898eb9bc2c0ad5f28d09cfe9f
diff --git a/src/signal.js b/src/signal.js index <HASH>..<HASH> 100644 --- a/src/signal.js +++ b/src/signal.js @@ -112,7 +112,7 @@ Signal.sequentially = function(n, as) { as = F.tail(as); if (F.empty(as)) { - clearTimeout(handle); + clearInterval(handle); done(); } }, n);
Fix issue stopping timer in sequentially function
nullobject_bulb
train
js
e92db8fa1e19ab11d372d233c70ffa008560f16e
diff --git a/src/virtual-machine.js b/src/virtual-machine.js index <HASH>..<HASH> 100644 --- a/src/virtual-machine.js +++ b/src/virtual-machine.js @@ -245,7 +245,6 @@ class VirtualMachine extends EventEmitter { const zip = new JSZip(); // Put everything in a zip file - // TODO compression? zip.file('project.json', projectJson); for (let i = 0; i < soundDescs.length; i++) { const currSound = soundDescs[i]; @@ -260,7 +259,7 @@ class VirtualMachine extends EventEmitter { type: 'blob', compression: 'DEFLATE', compressionOptions: { - level: 9 // best compression (level 1 would be best speed) + level: 6 // Tradeoff between best speed (1) and best compression (9) } }); }
Don't really need level 9 compression.
LLK_scratch-vm
train
js
c86849aadfc277a6cf2c5bc05f52824624782f08
diff --git a/src/Manager.php b/src/Manager.php index <HASH>..<HASH> 100644 --- a/src/Manager.php +++ b/src/Manager.php @@ -393,7 +393,7 @@ class Manager public function addLocale($locale) { - $localeDir = $this->app->langPath().'/'.$locale; + $localeDir = $this->app->langPath().'/'.basename($locale); $this->ignoreLocales = array_diff($this->ignoreLocales, [$locale]); $this->saveIgnoredLocales();
Update Manager.php (#<I>)
barryvdh_laravel-translation-manager
train
php
3ef80942236abe73318f25ece8cff9b2a55b53d1
diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Service/Controller/NodeController.php b/TYPO3.Neos/Classes/TYPO3/Neos/Service/Controller/NodeController.php index <HASH>..<HASH> 100644 --- a/TYPO3.Neos/Classes/TYPO3/Neos/Service/Controller/NodeController.php +++ b/TYPO3.Neos/Classes/TYPO3/Neos/Service/Controller/NodeController.php @@ -251,7 +251,7 @@ class NodeController extends AbstractServiceController public function moveAndRenderAction(Node $node, Node $targetNode, $position, $typoScriptPath) { $this->nodeOperations->move($node, $targetNode, $position); - $this->redirectToRenderNode($targetNode, $typoScriptPath); + $this->redirectToRenderNode($node, $typoScriptPath); } /**
BUGFIX: Redirect to moved node instead of move target NEOS-<I>
neos_neos-development-collection
train
php
97ed0930e076000019d9bc73e540de0efecd982d
diff --git a/Helper/WebTestCaseTrait.php b/Helper/WebTestCaseTrait.php index <HASH>..<HASH> 100644 --- a/Helper/WebTestCaseTrait.php +++ b/Helper/WebTestCaseTrait.php @@ -13,6 +13,11 @@ trait WebTestCaseTrait public static function setUpBeforeClass() { + static::drawSetUpBeforeClass(); + } + + public static function drawSetUpBeforeClass() + { static::$client = static::createClient(); }
helper method to ease extend of setUpBeforeClass
mpoiriert_draw-test-helper-bundle
train
php
4a7bd1bbdc329f9f9f2f5d7a9a24186634dc6e1c
diff --git a/crosscat/tests/quality_tests/synthetic_data_generator.py b/crosscat/tests/quality_tests/synthetic_data_generator.py index <HASH>..<HASH> 100644 --- a/crosscat/tests/quality_tests/synthetic_data_generator.py +++ b/crosscat/tests/quality_tests/synthetic_data_generator.py @@ -116,7 +116,6 @@ def generate_separated_multinomial_weights(A,C): maxdex = numpy.argmin(lower_bounds) B[maxdex] = 0 B /= numpy.sum(B) - print('Broke') break move_down = dns[random.randrange(len(dns))]
remove 'broke' print statement the 'broke' refers to the code breaking from a loop, rather than actual code being broken. Either way, it is not necessary.
probcomp_crosscat
train
py
8bd84eacf09c66c742e09e70302db2e08ba9b66b
diff --git a/spec/danger_plugin_spec.rb b/spec/danger_plugin_spec.rb index <HASH>..<HASH> 100755 --- a/spec/danger_plugin_spec.rb +++ b/spec/danger_plugin_spec.rb @@ -221,7 +221,7 @@ module Danger ]) expect_any_instance_of(Swiftlint).to receive(:lint) - .with(hash_including(config: File.expand_path('spec/fixtures/some_config.yml')), '') + .with(hash_including(config: 'spec/fixtures/some_config.yml'), '') .once .and_return(@swiftlint_response)
Update danger_plugin_spec.rb
ashfurrow_danger-ruby-swiftlint
train
rb
65016d595fb70f9a5a7765354e889423169269cd
diff --git a/app/addons/documents/resources.js b/app/addons/documents/resources.js index <HASH>..<HASH> 100644 --- a/app/addons/documents/resources.js +++ b/app/addons/documents/resources.js @@ -351,7 +351,7 @@ Documents.BulkDeleteDocCollection = FauxtonAPI.Collection.extend({ }, url: function () { - return app.host + '/' + this.databaseId + '/_bulk_docs'; + return FauxtonAPI.urls('bulk_docs', 'server', this.databaseId, ''); }, bulkDelete: function () {
replace url construction with FauxtonAPI lookup
apache_couchdb-fauxton
train
js
c07de69a82c032b75adadc7aa332a6931a42d22c
diff --git a/ra.js b/ra.js index <HASH>..<HASH> 100644 --- a/ra.js +++ b/ra.js @@ -169,6 +169,30 @@ libRa.require = function(libname_, dirname) { return libRa.middlewareify(lib); }; +/** + * + */ +libRa.adapt = function(a,b,c,d) { /* (argv, context, callback1, callback) -or- (arguments, callback) */ + + const callback = (arguments.length === 2 ? b : d); + const [argv, context, callback1] = (arguments.length === 2 ? a : [a,b,c]); + + var ra = {}; + + ra.wrap = function(fn) { + return function(argv, callback) { + return fn(argv, context, callback); + }; + }; + + // Must return (below) before we call the callback + sg.setTimeout(1, function() { + return callback(argv, context, callback1); + }); + + return ra; +}; + const safeRequire = function(name) { try { return require(name);
New function is a gift to enjoy the stars
briancsparks_run-anywhere
train
js
34763d721029ec1c32010449195496711d1b576e
diff --git a/spec/unit/policy_builder/policyfile_spec.rb b/spec/unit/policy_builder/policyfile_spec.rb index <HASH>..<HASH> 100644 --- a/spec/unit/policy_builder/policyfile_spec.rb +++ b/spec/unit/policy_builder/policyfile_spec.rb @@ -688,7 +688,8 @@ describe Chef::PolicyBuilder::Policyfile do context "with a policy group set" do before do Chef::Config[:policy_group] = "policy_group_value" - policy_builder.apply_policyfile_attributes + policy_builder.finish_load_node(node) + policy_builder.build_node end it "hoists default attributes" do
Make sure before block of specs is calling correct methods now defensive code removed
chef_chef
train
rb
9afa4d09a3f2916a2a607a29ea8f5d5a47dc5735
diff --git a/cachetclient/cachet.py b/cachetclient/cachet.py index <HASH>..<HASH> 100644 --- a/cachetclient/cachet.py +++ b/cachetclient/cachet.py @@ -119,7 +119,7 @@ class Components(Cachet): if id is not None: return self._get('components/%s' % id) else: - return self._get('components') + return self._get('components', data=kwargs) @api_token_required def post(self, **kwargs):
Search components by kwargs
dmsimard_python-cachetclient
train
py
77c2fbf02dfbe10253b572c5705688414f081c82
diff --git a/src/shared/scripts/Autocomplete.js b/src/shared/scripts/Autocomplete.js index <HASH>..<HASH> 100644 --- a/src/shared/scripts/Autocomplete.js +++ b/src/shared/scripts/Autocomplete.js @@ -280,8 +280,7 @@ function turnOn() { - // .trim() - that._currentQuery = that._el.value.replace(/^\s+|\s+$/g, ''); + that._currentQuery = that._el.value.trim(); // when the user writes window.clearTimeout(that._stopTyping);
#<I> Use native .trim() Native .trim() is supported in all browsers since we use es5-shim for older browsers (mean IE8)
mercadolibre_chico
train
js
426323a0f6bc3894a02e33afe4f9500ef131092b
diff --git a/widgets.py b/widgets.py index <HASH>..<HASH> 100644 --- a/widgets.py +++ b/widgets.py @@ -363,6 +363,9 @@ class WTextEntry(EditorExt): self.adjust_cursor_eol() self.just_started = True + def get_text(self): + return self.get_cur_line() + def handle_cursor_keys(self, key): if super().handle_cursor_keys(key): if self.just_started:
widgets: WTextEntry: Add get_text() method to get widget value.
pfalcon_picotui
train
py
55e0a7b1485687e100e712fa1f13cf4d4969e647
diff --git a/packages/veritone-redux-common/src/helpers/api/fetchGraphQLApi.js b/packages/veritone-redux-common/src/helpers/api/fetchGraphQLApi.js index <HASH>..<HASH> 100644 --- a/packages/veritone-redux-common/src/helpers/api/fetchGraphQLApi.js +++ b/packages/veritone-redux-common/src/helpers/api/fetchGraphQLApi.js @@ -13,7 +13,7 @@ export default function fetchGraphQLApi({ operationName }), headers: { - Authorization: `bearer ${token}`, + Authorization: token ? `bearer ${token}` : null, 'Content-Type': 'application/json' } }).then(r => r.json());
do not send undefined bearer header
veritone_veritone-sdk
train
js
ac39546904d92e3636a811c69b59dfdbe975c6d5
diff --git a/lib/action_kit_api/data_model.rb b/lib/action_kit_api/data_model.rb index <HASH>..<HASH> 100644 --- a/lib/action_kit_api/data_model.rb +++ b/lib/action_kit_api/data_model.rb @@ -18,7 +18,8 @@ module ActionKitApi # TODO: Add blacklisting to the model to prevent read-only attributes from syncing # this is a temporary fix. - hash = self.to_hash.delete("subscription_status") + hash = self.to_hash + hash.delete("subscription_status") response = ActionKitApi::Connection.call("#{class_name}.save_or_create", hash) # Update ourselves to include the data that the server populated
Fixed issue of sending server nil on creating if the user's subscription status isn't set
Democracy-for-America_ActionKitApi
train
rb
feeec1dd921a12ec74b1bf6c815500be0075c239
diff --git a/lib/picture_tag-rails/view_helpers.rb b/lib/picture_tag-rails/view_helpers.rb index <HASH>..<HASH> 100644 --- a/lib/picture_tag-rails/view_helpers.rb +++ b/lib/picture_tag-rails/view_helpers.rb @@ -45,7 +45,6 @@ module PictureTag size = nil elsif options[:default_size] options[:prefix_size] = false - prefix_size = false size = options[:default_size] end
turn the prefix back on for overridded default size
G5_picture_tag-rails
train
rb
7b345e155805a68c0d140a0e725cd4f6168b0e7c
diff --git a/library/Zepto/Zepto.php b/library/Zepto/Zepto.php index <HASH>..<HASH> 100644 --- a/library/Zepto/Zepto.php +++ b/library/Zepto/Zepto.php @@ -121,6 +121,11 @@ class Zepto { $this->setup_router(); } + /** + * Executes router and returns result of callback function for specified route + * + * @return mixed + */ public function run() { $router = $this->container['router']; @@ -153,6 +158,11 @@ class Zepto { return true; } + /** + * Loads all plugins from the 'plugins' directory + * + * @return + */ protected function load_plugins() { $container = $this->container;
Added more comments to ``Zepto\Zepto``
hassankhan_Sonic
train
php
10607fb9f5bdd8a3ab31a766843e89ee3bd78da5
diff --git a/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java b/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java +++ b/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java @@ -461,18 +461,18 @@ public abstract class AbstractBlockChain { checkState(tryConnecting, "bug in tryConnectingOrphans"); log.warn("Block does not connect: {} prev {}", block.getHashAsString(), block.getPrevBlockHash()); orphanBlocks.put(block.getHash(), new OrphanBlock(block, filteredTxHashList, filteredTxn)); + if (tryConnecting) + tryConnectingOrphans(); return false; } else { checkState(lock.isHeldByCurrentThread()); // It connects to somewhere on the chain. Not necessarily the top of the best known chain. params.checkDifficultyTransitions(storedPrev, block, blockStore); connectBlock(block, storedPrev, shouldVerifyTransactions(), filteredTxHashList, filteredTxn); + if (tryConnecting) + tryConnectingOrphans(); + return true; } - - if (tryConnecting) - tryConnectingOrphans(); - - return true; } finally { lock.unlock(); }
AbstractBlockChain: Try connecting orphans more often in add(). This fixes a memory leak.
bitcoinj_bitcoinj
train
java
1b214542a7ba53648abda31a9fec3c94b38ccbd5
diff --git a/mespronos_group/src/Entity/Group.php b/mespronos_group/src/Entity/Group.php index <HASH>..<HASH> 100644 --- a/mespronos_group/src/Entity/Group.php +++ b/mespronos_group/src/Entity/Group.php @@ -215,6 +215,10 @@ class Group extends ContentEntityBase implements GroupInterface { return $ids; } + /** + * @param \Drupal\user\Entity\User|NULL $user + * @return bool|Group + */ public static function getUserGroup(User $user = null) { if($user == null) { $user = \Drupal::currentUser();
refactoring - clean Group entity
mespronos_mespronos
train
php
1f8039fe6504de97b20d8b3036f7e795955b10c1
diff --git a/unzip_requirements.py b/unzip_requirements.py index <HASH>..<HASH> 100644 --- a/unzip_requirements.py +++ b/unzip_requirements.py @@ -6,7 +6,8 @@ import zipfile pkgdir = '/tmp/sls-py-req' -sys.path.append(pkgdir) +# We want our path to look like [working_dir, serverless_requirements, ...] +sys.path.insert(1, pkgdir) if not os.path.exists(pkgdir): tempdir = '/tmp/_temp-sls-py-req'
Insert zipped packages at beginning of path #<I>
UnitedIncome_serverless-python-requirements
train
py
19f000d82b4d826abf73a9dd08d706c4752af2b4
diff --git a/httputil/do.go b/httputil/do.go index <HASH>..<HASH> 100644 --- a/httputil/do.go +++ b/httputil/do.go @@ -30,6 +30,7 @@ type canceller interface { } // Wait until the context is cancelled, then cancel the supplied HTTP request. +// If the caller closes finished before this happens, return early. // // HACK(jacobsa): The http package's design for cancellation is flawed: the // canceller must naturally race with the transport receiving the request -- @@ -44,13 +45,19 @@ func waitForCancellation( finished chan struct{}, req *http.Request) { // If there is no done channel, there's nothing we can do. - done := ctx.Done() - if done == nil { + cancelChan := ctx.Done() + if cancelChan == nil { return } - // Wait for the context to be cancelled. - <-done + // Wait for the context to be cancelled or for the caller to say they no + // longer care because the HTTP request has been completed. + select { + case <-cancelChan: + + case <-finished: + return + } // Keep cancelling the HTTP request until the finished channel is closed, as // discussed above. @@ -82,9 +89,8 @@ func Do( return } - // Wait for cancellation in the background. Note that this goroutine should - // eventually return, because context.WithCancel requires the caller to - // arrange for cancellation to happen eventually. + // Wait for cancellation in the background, returning early if this function + // returns. finished := make(chan struct{}) defer close(finished) go waitForCancellation(ctx, c, finished, req)
Fixed a goroutine leak for long-lived cancellable contexts.
jacobsa_gcloud
train
go
e1dcd409336aa3c4e37145a5918feb3e26832551
diff --git a/src/DTOMarketplace/Context/Venture/Product/UpdateImage.php b/src/DTOMarketplace/Context/Venture/Product/UpdateImage.php index <HASH>..<HASH> 100644 --- a/src/DTOMarketplace/Context/Venture/Product/UpdateImage.php +++ b/src/DTOMarketplace/Context/Venture/Product/UpdateImage.php @@ -32,6 +32,7 @@ class UpdateImage extends Base return $this->prepareExport( [ 'sku' => $dataWrapper->getSku(), + 'partner_sku' => $dataWrapper->getPartnerSku(), 'image_collection' => $imageCollection ] );
Added partner sku on upda teimage context
GFG_dto-marketplace
train
php
a1e93b909a52791b1c1a9aa848ef2958afcf40b4
diff --git a/grr/server/grr_response_server/bin/config_updater_util.py b/grr/server/grr_response_server/bin/config_updater_util.py index <HASH>..<HASH> 100644 --- a/grr/server/grr_response_server/bin/config_updater_util.py +++ b/grr/server/grr_response_server/bin/config_updater_util.py @@ -757,7 +757,7 @@ def Initialize(config=None, """Initialize or update a GRR configuration.""" print("Checking write access on config %s" % config["Config.writeback"]) - if not os.access(config.parser.filename, os.W_OK): + if not os.access(config.parser.config_path, os.W_OK): raise IOError("Config not writeable (need sudo?)") print("\nStep 0: Importing Configuration from previous installation.") @@ -861,7 +861,7 @@ def InitializeNoPrompt( raise ValueError("--noprompt set, but --mysql_password was not provided.") print("Checking write access on config %s" % config.parser) - if not os.access(config.parser.filename, os.W_OK): + if not os.access(config.parser.config_path, os.W_OK): raise IOError("Config not writeable (need sudo?)") config_dict = {}
Fixing config_updater_util. "filename" should be "config_path" when dealing with GRRConfigParsers.
google_grr
train
py
99480cfcc11b704c06a5e91fa7106a3aeb9295f2
diff --git a/packages/vaex-jupyter/setup.py b/packages/vaex-jupyter/setup.py index <HASH>..<HASH> 100644 --- a/packages/vaex-jupyter/setup.py +++ b/packages/vaex-jupyter/setup.py @@ -14,7 +14,7 @@ author_email = '[email protected]' license = 'MIT' version = version.__version__ url = 'https://www.github.com/maartenbreddels/vaex' -install_requires_jupyter = ['vaex-core>=0.6', 'vaex-viz', 'bqplot>=0.10.1', 'ipyvolume>=0.4', 'ipyleaflet', 'ipympl', 'ipyvuetify'] +install_requires_jupyter = ['vaex-core>=1.0.0,<2', 'vaex-viz', 'bqplot>=0.10.1', 'ipyvolume>=0.4', 'ipyleaflet', 'ipympl', 'ipyvuetify'] setup(name=name + '-jupyter', version=version,
Release <I> of vaex-jupyter
vaexio_vaex
train
py
2fad25e466c34b171c56a4ace7dc9be3ff3338e5
diff --git a/src/Core_Command.php b/src/Core_Command.php index <HASH>..<HASH> 100644 --- a/src/Core_Command.php +++ b/src/Core_Command.php @@ -1372,7 +1372,13 @@ EOT; return; } - $files_to_remove = array_diff( array_keys( $old_checksums ), array_keys( $new_checksums ) ); + // Compare the files from the old version and the new version in a case-insensitive manner, + // to prevent files being incorrectly deleted on systems with case-insensitive filesystems + // when core changes the case of filenames. + $files_to_remove = array_diff( + array_map( 'strtolower', array_keys( $old_checksums ) ), + array_map( 'strtolower', array_keys( $new_checksums ) ) + ); if ( ! empty( $files_to_remove ) ) { WP_CLI::log( 'Cleaning up files...' );
When cleaning up files after an update, compare the filenames from the old and new versions in a case-insensitive manner to prevent files being incorrectly deleted on systems with case-insensitive filesystems when core changes the case of filenames.
wp-cli_core-command
train
php
e5ab67915532448e653074b862371a65b8e701e2
diff --git a/src/main/java/org/dasein/cloud/aws/compute/EC2Instance.java b/src/main/java/org/dasein/cloud/aws/compute/EC2Instance.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/dasein/cloud/aws/compute/EC2Instance.java +++ b/src/main/java/org/dasein/cloud/aws/compute/EC2Instance.java @@ -1651,8 +1651,14 @@ public class EC2Instance extends AbstractVMSupport<AWSCloud> { t = new Tag(); t.setKey("Description"); t.setValue(cfg.getDescription()); - toCreate[i] = t; + toCreate[i++] = t; + if( cfg.getVirtualMachineGroup() != null ) { + t = new Tag(); + t.setKey("dsnVMGroup"); + t.setValue(cfg.getVirtualMachineGroup()); + toCreate[i] = t; + } getProvider().createTags(server.getProviderVirtualMachineId(), toCreate); if( !existingVolumes.isEmpty() ) {
Added VM group tagging
dasein-cloud_dasein-cloud-aws
train
java
52e0d85933bdfd23f08013c31c04a95414652b4a
diff --git a/examples/powershell_script/spec/run_spec.rb b/examples/powershell_script/spec/run_spec.rb index <HASH>..<HASH> 100644 --- a/examples/powershell_script/spec/run_spec.rb +++ b/examples/powershell_script/spec/run_spec.rb @@ -16,7 +16,7 @@ describe 'powershell_script::run' do end it 'runs a powershell_script with attributes' do - expect(chef_run).to run_powershell_script('with_attributes').with(flags: '--flags') + expect(chef_run).to run_powershell_script('with_attributes').with(flags: anything) expect(chef_run).to_not run_powershell_script('with_attributes').with(flags: '--not-flags') end end
Minor fixes while running powershell_script - Default flags will also be appended before the user provided flags - Since default flags are system dependant and we might not predict their actual value at runtime, so using `anything` matcher. - Ensured Chefstyle - Fixes: - [Issue#<I>](<URL>) - [Travis at PR#<I>](<URL>)
chefspec_chefspec
train
rb
4f2bf986a7f5101116fcaf398f70bcfedd265792
diff --git a/tools/cut_release.py b/tools/cut_release.py index <HASH>..<HASH> 100755 --- a/tools/cut_release.py +++ b/tools/cut_release.py @@ -88,7 +88,13 @@ if "__main__" == __name__: return re.sub(r"\+\+\+(\w+)\+\+\+", lambda m: fields[m.group(1)], s) # List of files that need to have ##DUPE## and ##REPLACE## sections expanded - files_to_rewrite = [maven_metadata_path] + # NOTE(12 February 2013): We no longer rewrite maven_metadata_path since this + # project is now hosted in Maven Central, and maven_metadata used a + # groupId/artifactId pair that is incompatible with the convention used by + # Maven Central. + # All maven versions after 12 February are undiscoverable by looking at + # maven_metadata. + files_to_rewrite = [] new_file_paths = [] def copy_directory_structure_template(src_path, container_path):
allow dependency on newer guava versions
OWASP_java-html-sanitizer
train
py
587ba100cc25088e37c06b28734e550ab6318770
diff --git a/src/Behat/Behat/Compiler/PharCompiler.php b/src/Behat/Behat/Compiler/PharCompiler.php index <HASH>..<HASH> 100644 --- a/src/Behat/Behat/Compiler/PharCompiler.php +++ b/src/Behat/Behat/Compiler/PharCompiler.php @@ -114,7 +114,7 @@ class PharCompiler * file that was distributed with this source code. */ -define('BEHAT_PHP_BIN_PATH', '/usr/bin/env php'); +define('BEHAT_PHP_BIN_PATH', 'php'); define('BEHAT_BIN_PATH', __FILE__); define('BEHAT_VERSION', '%s');
use global path as behat bin path
Behat_Behat
train
php
2be90e2f1ca54e88a3acf6e82a09101ed79a51d7
diff --git a/demo.js b/demo.js index <HASH>..<HASH> 100644 --- a/demo.js +++ b/demo.js @@ -15,8 +15,10 @@ requirejs.config({ // from the JavaScript console. var viewer; -require(['pv'], function(pv) { +var pv; +require(['pv'], function(PV) { +pv = PV; var io = pv.io; var viewpoint = pv.viewpoint; var color = pv.color;
[demo] also put pv into global namespace for debugging
biasmv_pv
train
js
2c8fe72466fdfc5bf03de4478586380ba8ae2652
diff --git a/test/complex/js/wechat.js b/test/complex/js/wechat.js index <HASH>..<HASH> 100644 --- a/test/complex/js/wechat.js +++ b/test/complex/js/wechat.js @@ -8,13 +8,12 @@ Mobilebone.onpagefirstinto = function(pageinto) { ele_screen_shot.width = window.innerWidth; ele_screen_shot.height = Math.round(ele_screen_shot.width * 2405 / 720); } - - + // bind custom scroll events for content var weChatScroll = new IScroll(pageinto.querySelector(".content"), { tap: true }); - pageinto.addEventListener('tap', Mobilebone.handleTapEvent, false); + /Android/i.test(navigator.userAgent) && pageinto.addEventListener('tap', Mobilebone.handleTapEvent, false); }; Mobilebone.callback = function(pageinto, pageout) {
safari no need to hack safari no need to hack
zhangxinxu_mobilebone
train
js
36b2fc4367e68aa8c2abc62c498b0e3e69e7af0b
diff --git a/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java b/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java index <HASH>..<HASH> 100644 --- a/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java +++ b/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java @@ -645,6 +645,17 @@ public class HttpRequest { return new HttpRequest(url, METHOD_TRACE); } + /** + * Set the 'http.keepAlive' property to the given value. + * <p> + * This setting will apply to requests. + * + * @param keepAlive + */ + public static void keepAlive(boolean keepAlive) { + System.setProperty("http.keepAlive", Boolean.toString(keepAlive)); + } + private final HttpURLConnection connection; private RequestOutputStream output;
Add helper to set http.keepAlive property
kevinsawicki_http-request
train
java
17b6bf41564f37fbbb770a02bd5e2ad5cae9380a
diff --git a/goldsberry/league/_League.py b/goldsberry/league/_League.py index <HASH>..<HASH> 100644 --- a/goldsberry/league/_League.py +++ b/goldsberry/league/_League.py @@ -312,6 +312,6 @@ class Lineups: -__all__ = ['Transactions', 'DailyStandings', 'FranchiseHistory', +__all__ = ['Transactions', 'ScoreBoard', 'FranchiseHistory', 'PlayoffPicture', 'LeagueLeaders', 'ClutchStats', 'ClassicStats', 'Lineups'] \ No newline at end of file
updated __all__ with ScoreBoard
bradleyfay_py-Goldsberry
train
py
450a6cf19d5165082b2fac98a92a7e7f820e6c3c
diff --git a/indra/assemblers/cag_assembler.py b/indra/assemblers/cag_assembler.py index <HASH>..<HASH> 100644 --- a/indra/assemblers/cag_assembler.py +++ b/indra/assemblers/cag_assembler.py @@ -57,7 +57,8 @@ class CAGAssembler(object): nx.MultiDiGraph The assembled CAG. """ - self.grounding_threshold = grounding_threshold + if grounding_threshold is not None: + self.grounding_threshold = grounding_threshold # Filter to Influence Statements which are currently supported statements = [stmt for stmt in self.statements if
Fixed issue where the node names in the generated Jupyter JS were not being grounded
sorgerlab_indra
train
py
b8a5a2d205e6a30d8a09769eca9d18972389e397
diff --git a/core-bundle/src/Resources/contao/library/Contao/File.php b/core-bundle/src/Resources/contao/library/Contao/File.php index <HASH>..<HASH> 100644 --- a/core-bundle/src/Resources/contao/library/Contao/File.php +++ b/core-bundle/src/Resources/contao/library/Contao/File.php @@ -401,7 +401,7 @@ class File extends \System /** - * Truncate the file + * Truncate the file and reset file pointer * * @return boolean True if the operation was successful */ @@ -410,6 +410,7 @@ class File extends \System if (is_resource($this->resFile)) { ftruncate($this->resFile, 0); + rewind($this->resFile); } return $this->write('');
[Core] Reset the file pointer when truncating the file
contao_contao
train
php
8dc1cf94c13cad5b1be20ca82a99fb14fc29311a
diff --git a/client.go b/client.go index <HASH>..<HASH> 100644 --- a/client.go +++ b/client.go @@ -369,7 +369,7 @@ func (d *Dialer) Dial(urlStr string, requestHeader http.Header) (*Conn, *http.Re return nil, resp, ErrBadHandshake } - for _, ext := range parseExtensions(req.Header) { + for _, ext := range parseExtensions(resp.Header) { if ext[""] != "permessage-deflate" { continue }
enable client compression based on response header
gorilla_websocket
train
go
f58fc1d4447731984cdbc0268d5af15977a01224
diff --git a/tests/JwtTest.php b/tests/JwtTest.php index <HASH>..<HASH> 100644 --- a/tests/JwtTest.php +++ b/tests/JwtTest.php @@ -20,4 +20,11 @@ class JwtTest extends TestCase $this->assertSame('Hello', $jwt->getJwt()); } + + public function testGetJwtWithRealToken() + { + $jwt = new Jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'); + + $this->assertSame('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c', $jwt->getJwt()); + } }
Added jwt test for get jwt method using real jwt token.
RobDWaller_ReallySimpleJWT
train
php
ca775da6cc713da8413f2eb744a0178f3e8998f4
diff --git a/tests/test_declare.py b/tests/test_declare.py index <HASH>..<HASH> 100644 --- a/tests/test_declare.py +++ b/tests/test_declare.py @@ -23,6 +23,20 @@ class TestDeclare: assert_true(not issubclass(Subject, dj.Part)) @staticmethod + def test_class_help(): + help(TTest) + help(TTest2) + assert_true(TTest.definition in TTest.__doc__) + assert_true(TTest.definition in TTest2.__doc__) + + @staticmethod + def test_instance_help(): + help(TTest()) + help(TTest2()) + assert_true(TTest().definition in TTest().__doc__) + assert_true(TTest2().definition in TTest2().__doc__) + + @staticmethod def test_describe(): """real_definition should match original definition""" rel = Experiment() diff --git a/tests/test_relation.py b/tests/test_relation.py index <HASH>..<HASH> 100644 --- a/tests/test_relation.py +++ b/tests/test_relation.py @@ -36,12 +36,6 @@ class TestRelation: cls.img = schema.Image() cls.trash = schema.UberTrash() - def test_class_help(self): - help(schema.TTest) - - def test_instance_help(self): - help(schema.TTest()) - def test_contents(self): """ test the ability of tables to self-populate using the contents property
improve unit test for definition in docstring
datajoint_datajoint-python
train
py,py
91a0a1156e622cad5221f33e852c19aa8eba6cbf
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb index <HASH>..<HASH> 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -28,7 +28,7 @@ module ActiveSupport end class InvalidMessage < StandardError; end - OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError + OpenSSLCipherError = OpenSSL::Cipher::CipherError # Initialize a new MessageEncryptor. +secret+ must be at least as long as # the cipher key size. For the default 'aes-256-cbc' cipher, this is 256 @@ -66,12 +66,11 @@ module ActiveSupport def _encrypt(value) cipher = new_cipher - # Rely on OpenSSL for the initialization vector - iv = cipher.random_iv - cipher.encrypt cipher.key = @secret - cipher.iv = iv + + # Rely on OpenSSL for the initialization vector + iv = cipher.random_iv encrypted_data = cipher.update(@serializer.dump(value)) encrypted_data << cipher.final
Reorganize MessageEncryptor 1) According to OpenSSL's documentation, cipher.random_iv must be called after cipher.encrypt and already sets the generated IV on the cipher. 2) OpenSSL::CipherError was moved to OpenSSL::Cipher::CipherError in Ruby <I>. Since Rails 4 requires at least Ruby <I>, support for the old location can be dropped.
rails_rails
train
rb
eea81d8a4694be945b78501cbe76d92f11aec5c5
diff --git a/src/TranslatableBootForm.php b/src/TranslatableBootForm.php index <HASH>..<HASH> 100644 --- a/src/TranslatableBootForm.php +++ b/src/TranslatableBootForm.php @@ -119,9 +119,9 @@ class TranslatableBootForm /** * Form constructor. * - * @param \AdamWathan\BootForms\BootForm $form + * @param object $form */ - public function __construct(BootForm $form) + public function __construct($form) { $this->form = $form; $this->config = config('translatable-bootforms'); @@ -406,4 +406,4 @@ class TranslatableBootForm $this->overwriteArgument('label', str_replace('%locale', $locale, $localizedLabel)); } -} \ No newline at end of file +}
Remove typehint for decoration compatibility
TypiCMS_Laravel-Translatable-Bootforms
train
php
84d5efa9ed2ea65ade06c0e1ab394c47f61228eb
diff --git a/run_conformance_tests.py b/run_conformance_tests.py index <HASH>..<HASH> 100755 --- a/run_conformance_tests.py +++ b/run_conformance_tests.py @@ -59,7 +59,7 @@ if __name__ == '__main__': selection = select(selector, input) print "res: %s" % selection print "cmp: %s" % output - if selection != output: + if json.dumps(selection) != output: test_failures.append(selector) if len(test_failures):
cmp selector aoutput as json
mwhooker_jsonselect
train
py
ccb84f97e0beb31acd1bcc033ff204d6e7df91b5
diff --git a/Kwf_js/Kwf.js b/Kwf_js/Kwf.js index <HASH>..<HASH> 100644 --- a/Kwf_js/Kwf.js +++ b/Kwf_js/Kwf.js @@ -137,3 +137,33 @@ Kwf.restart = function() var restart = Kwf.restart; var include = Kwf.include; + + +//source: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind +if (!Function.prototype.bind) { + Function.prototype.bind = function(oThis) { + if (typeof this !== 'function') { + // closest thing possible to the ECMAScript 5 + // internal IsCallable function + throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable'); + } + + var aArgs = Array.prototype.slice.call(arguments, 1), + fToBind = this, + fNOP = function() {}, + fBound = function() { + return fToBind.apply(this instanceof fNOP + ? this + : oThis, + aArgs.concat(Array.prototype.slice.call(arguments))); + }; + + if (this.prototype) { + // native functions don't have a prototype + fNOP.prototype = this.prototype; + } + fBound.prototype = new fNOP(); + + return fBound; + }; +}
Add Function.prototype.bind polyfill Modernizr 2 included this polyfill and Modernizr 3 doesn't anymore. Since the update to Modernizr 3 all webs using bind where broken in IE 8.
koala-framework_koala-framework
train
js
aa6121c80050257619ce309b862fa4796b621858
diff --git a/server/src/main/java/org/axway/grapes/server/core/options/filters/DoNotUseFilter.java b/server/src/main/java/org/axway/grapes/server/core/options/filters/DoNotUseFilter.java index <HASH>..<HASH> 100644 --- a/server/src/main/java/org/axway/grapes/server/core/options/filters/DoNotUseFilter.java +++ b/server/src/main/java/org/axway/grapes/server/core/options/filters/DoNotUseFilter.java @@ -34,6 +34,9 @@ public class DoNotUseFilter implements Filter { @Override public Map<String, Object> artifactFilterFields() { - return new HashMap<String, Object>(); + final Map<String, Object> filters = new HashMap<String, Object>(); + filters.put(DbArtifact.DO_NOT_USE, doNotUse); + + return filters; } }
Fix "do_not_use" filter for "get all artifacts" requests
Axway_Grapes
train
java
c4303f3a302099576f3aeccccfd364d3f9a03033
diff --git a/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php b/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php index <HASH>..<HASH> 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php @@ -106,7 +106,11 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements $this->called[$eventName.'.'.$info['pretty']] = $info; - $e2 = $this->stopwatch->start(substr($info['class'], strrpos($info['class'], '\\') + 1), 'event_listener'); + $name = isset($info['class']) + ? substr($info['class'], strrpos($info['class'], '\\') + 1) + : 'Closure'; + + $e2 = $this->stopwatch->start($name, 'event_listener'); call_user_func($listener, $event);
TraceableEventDispatcher uses 'Closure' as the StopWatch name for Closures
symfony_symfony
train
php
f9d7fe5af81c6f13e1e1d15105709a2fe8f5110f
diff --git a/src/core.js b/src/core.js index <HASH>..<HASH> 100644 --- a/src/core.js +++ b/src/core.js @@ -105,8 +105,8 @@ $.fn.powerTip = function(opts, arg) { ); }); + // attach events to matched elements if the manual options is not enabled if (!options.manual) { - // attach hover events to all matched elements this.on({ // mouse events 'mouseenter.powertip': function elementMouseEnter(event) {
Updated attach events comment for manual option.
stevenbenner_jquery-powertip
train
js
2f557560b7f68e42ff4ac7e46ab9812d4fb09cec
diff --git a/demo-theme/functions.php b/demo-theme/functions.php index <HASH>..<HASH> 100644 --- a/demo-theme/functions.php +++ b/demo-theme/functions.php @@ -150,7 +150,7 @@ if ( class_exists( 'Kirki' ) ) { 'settings' => 'code_demo', 'label' => __( 'Code Control', 'kirki' ), 'help' => __( 'This is a tooltip', 'kirki-demo' ), - 'description' => __( 'This is a cimple code control. You can define the language you want as well as the theme. For a full list of available languages and themes see http://ace.c9.io/build/kitchen-sink.html. In this demo we are using a CSS editor with the monokai theme.', 'kirki-demo' ), + 'description' => __( 'This is a simple code control. You can define the language you want as well as the theme. In this demo we are using a CSS editor with the monokai theme.', 'kirki-demo' ), 'section' => 'text', 'default' => 'body { background: #fff; }', 'priority' => 10,
remove ACE reference from the test theme
aristath_kirki
train
php
04206fb6ad7eeba96d27388ef0c37823c3e775ac
diff --git a/test/engine_fs_test.go b/test/engine_fs_test.go index <HASH>..<HASH> 100644 --- a/test/engine_fs_test.go +++ b/test/engine_fs_test.go @@ -548,6 +548,7 @@ func (e *fsEngine) InitTest(ver libkbfs.MetadataVer, uids[0] = nameToUID(e.tb, config0) for i, name := range users[1:] { c := libkbfs.ConfigAsUser(config0, name) + setBlockSizes(e.tb, c, blockSize, blockChangeSize) c.SetClock(clock) cfgs[i+1] = c uids[i+1] = nameToUID(e.tb, c) diff --git a/test/engine_libkbfs.go b/test/engine_libkbfs.go index <HASH>..<HASH> 100644 --- a/test/engine_libkbfs.go +++ b/test/engine_libkbfs.go @@ -63,6 +63,7 @@ func (k *LibKBFS) InitTest(ver libkbfs.MetadataVer, // create the rest of the users as copies of the original config for _, name := range users[1:] { c := libkbfs.ConfigAsUser(config, name) + setBlockSizes(k.tb, c, blockSize, blockChangeSize) c.SetClock(clock) userMap[name] = c k.refs[c] = make(map[libkbfs.Node]bool)
test: DSL tests didn't set block sizes for subsequent users Oops!
keybase_client
train
go,go
4541becb60792842a9e5aad7c6307a763e60a2df
diff --git a/scrypture_api.py b/scrypture_api.py index <HASH>..<HASH> 100644 --- a/scrypture_api.py +++ b/scrypture_api.py @@ -9,7 +9,7 @@ logging.basicConfig(level=logging.DEBUG) class ScryptureAPI(): def __init__(self, - base_url='http://localhost:5000', + base_url='http://www.scrypture.net/api/v1/', username=None, password=None, interactive_password=False):
Changed to point at scrypture.net by default
mosesschwartz_scrypture
train
py
b836d3f4ddfc2f865ffa659a5da1e582a1931b8b
diff --git a/src/feat/agencies/net/agency.py b/src/feat/agencies/net/agency.py index <HASH>..<HASH> 100644 --- a/src/feat/agencies/net/agency.py +++ b/src/feat/agencies/net/agency.py @@ -285,7 +285,11 @@ class Agency(agency.Agency): self._ssh.start_listening() self._journaler.set_connection_strings( self.config['agency']['journal']) - self._start_master_gateway() + try: + self._start_master_gateway() + except Exception as e: + error.handle_exception( + self, e, "Failed setting up gateway, it will stay disabled.") self._redirect_text_log() self._create_pid_file()
Fix starting feat if listening port for the gateway is not available.
f3at_feat
train
py
ef42f5b77097898f2fc27d5a6c1c1a259f3f0ae6
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index <HASH>..<HASH> 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,6 @@ unless RUBY_VERSION < '1.9' - require 'coveralls' require 'simplecov' + require 'coveralls' SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ SimpleCov::Formatter::HTMLFormatter,
minor: ooops! coveralls should load after simplecov here
mongodb_mongo-ruby-driver
train
rb
8b7110f66d67ea67bd4e2f3c0ee5b1f194a53277
diff --git a/src/js/utils/EventUtils/handleKeyboardAccessibility.js b/src/js/utils/EventUtils/handleKeyboardAccessibility.js index <HASH>..<HASH> 100644 --- a/src/js/utils/EventUtils/handleKeyboardAccessibility.js +++ b/src/js/utils/EventUtils/handleKeyboardAccessibility.js @@ -32,7 +32,7 @@ export default function handleKeyboardAccessibility(e, onClick, listenToEnter = const { tagName } = e.target; // it is valid to press space in text fields, contenteditable, and buttons - if (space && !tagName.match(/input|textarea|button/i) && !e.target.getAttribute('contenteditable') === 'true') { + if (space && !tagName.match(/input|textarea|button/i) && e.target.getAttribute('contenteditable') !== 'true') { // Stop page scrolling e.preventDefault(); }
Fixed a small != bug for keyboards... Don't look.
mlaursen_react-md
train
js
8bb56547921519b1b4f97877f269f056fff35964
diff --git a/src/main/java/com/klarna/hiverunner/config/HiveRunnerConfig.java b/src/main/java/com/klarna/hiverunner/config/HiveRunnerConfig.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/klarna/hiverunner/config/HiveRunnerConfig.java +++ b/src/main/java/com/klarna/hiverunner/config/HiveRunnerConfig.java @@ -140,7 +140,7 @@ public class HiveRunnerConfig { * between different clients. */ public CompatibilityMode getCompatibilityMode() { - return CompatibilityMode.valueOf(getString(COMPATIBILITY_MODE_PROPERTY_NAME)); + return CompatibilityMode.valueOf(getString(COMPATIBILITY_MODE_PROPERTY_NAME).toUpperCase()); } public void setTimeoutEnabled(boolean isEnabled) {
Compatibility mode property now case insensitive.
klarna_HiveRunner
train
java
42222651810cf099b197edd4743c4c1d0b548871
diff --git a/src/Envy.php b/src/Envy.php index <HASH>..<HASH> 100644 --- a/src/Envy.php +++ b/src/Envy.php @@ -166,7 +166,7 @@ class Envy if (isset($this->globals[$match[1]])) { return $this->globals[$match[1]]; } - return $match[0]; + return '!'.strtoupper($match[1]).'!'; }, $value );
don't go into an endless loop
monolyth-php_envy
train
php
2e0370032c8002260dac8c5a5c2032ec03da59b8
diff --git a/lib/browser/browser-load.js b/lib/browser/browser-load.js index <HASH>..<HASH> 100644 --- a/lib/browser/browser-load.js +++ b/lib/browser/browser-load.js @@ -35,8 +35,9 @@ exports.load = function(options,callback){ // Check if a HTTP redirect is present into the HTML page, if yes follow the redirect. if(body) var matches = body.match(/<meta[ ]*http-equiv="REFRESH"[ ]*content="0;[ ]*URL=(.*?)"[ ]*\/?>/); if(matches && matches[1]){ + options.url = matches[1]; request.get({ - uri : matches[1], + uri : options.url, timeout : 20000, headers : headers }, onend);
FIX: Set options.url with the url found in the meta tag. Allow if an HTTP error 5xx happens after, the correct URL will be query again.
lbdremy_scrapinode
train
js
ddcd144813be4f111834659b882d2e767d298cd3
diff --git a/hellosign_sdk/hsclient.py b/hellosign_sdk/hsclient.py index <HASH>..<HASH> 100644 --- a/hellosign_sdk/hsclient.py +++ b/hellosign_sdk/hsclient.py @@ -305,7 +305,7 @@ class HSClient(object): Args: page (int, optional): Which page number of the SignatureRequest list to return. Defaults to 1. - page_size (int, optional): Number of SignatureRequests to return per page. Since not explict + page_size (int, optional): Number of SignatureRequests to return per page. When not explicit it defaults to 20. Returns:
Update hellosign_sdk/hsclient.py Updated comment language
hellosign_hellosign-python-sdk
train
py
2281a22aaef6ead001b87a13c0119075cfc27c96
diff --git a/lottie/src/main/java/com/airbnb/lottie/RectangleContent.java b/lottie/src/main/java/com/airbnb/lottie/RectangleContent.java index <HASH>..<HASH> 100644 --- a/lottie/src/main/java/com/airbnb/lottie/RectangleContent.java +++ b/lottie/src/main/java/com/airbnb/lottie/RectangleContent.java @@ -101,7 +101,7 @@ class RectangleContent implements PathContent, BaseKeyframeAnimation.AnimationLi path.arcTo(rect, 90, 90, false); } - path.lineTo(position.x - halfWidth, position.y - halfHeight + 2 * radius); + path.lineTo(position.x - halfWidth, position.y - halfHeight + radius); if (radius > 0) { rect.set(position.x - halfWidth, @@ -111,7 +111,7 @@ class RectangleContent implements PathContent, BaseKeyframeAnimation.AnimationLi path.arcTo(rect, 180, 90, false); } - path.lineTo(position.x + halfWidth - 2 * radius, position.y - halfHeight); + path.lineTo(position.x + halfWidth - radius, position.y - halfHeight); if (radius > 0) { rect.set(position.x + halfWidth - 2 * radius,
Fix an issue with rounded rectangles Fixes #<I>
airbnb_lottie-android
train
java
5a136e804e5672df060c7e9830742ec92113f602
diff --git a/minio/__init__.py b/minio/__init__.py index <HASH>..<HASH> 100644 --- a/minio/__init__.py +++ b/minio/__init__.py @@ -17,4 +17,4 @@ from .acl import Acl from .parsers import Bucket, Object, ResponseError __author__ = "Minio, Inc." -__version__ = "0.1.dev9" +__version__ = "0.2.1"
Bumping to <I>
minio_minio-py
train
py
b581e7a8a86b5205aa0fcfdee6c3a9ece8bbe5e4
diff --git a/react/MuiCozyTheme/theme.js b/react/MuiCozyTheme/theme.js index <HASH>..<HASH> 100644 --- a/react/MuiCozyTheme/theme.js +++ b/react/MuiCozyTheme/theme.js @@ -83,7 +83,8 @@ const makeTypography = palette => ({ caption: { fontSize: 12, lineHeight: 1.313, - color: palette.text.secondary + color: palette.text.secondary, + display: 'block' } })
feat: Force caption to display as block MUI changed the default display of captions, they no longer as blocks by default, leading to bad margins. Let's force captions to be blocks
cozy_cozy-ui
train
js
5cc832b9d28ed5562961385a3b30ad242d76aac1
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ REQUIRED_PACKAGES = [ 'six >= 1.10.0', 'numpy >= 1.13.3', 'decorator', - 'cloudpickle >= 1.2.2', + 'cloudpickle == 1.3', # TODO(b/155109696): Unpin cloudpickle version. 'gast >= 0.3.2' # For autobatching ]
Pin Cloudpickle version to unbreak Kokoro build. PiperOrigin-RevId: <I>
tensorflow_probability
train
py
bf1fc6bc237de7cc9c4a967434f91c11af47fee1
diff --git a/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java b/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java +++ b/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java @@ -37,6 +37,9 @@ import java.util.List; public class AdaptiveReceiveBufferSizePredictor implements ReceiveBufferSizePredictor { + // FIXME There's no easy way to configure receiveBufferSizePredictor + // via Bootstrap.setOption() because it works for only one channel. + private static final int INDEX_INCREMENT = 4; private static final int INDEX_DECREMENT = 1;
Added a FIXME as a reminder for API redesign
netty_netty
train
java
60a4eeda4f65ddb16d03507096847cd79e69354f
diff --git a/holocron/ext/generators/blog.py b/holocron/ext/generators/blog.py index <HASH>..<HASH> 100644 --- a/holocron/ext/generators/blog.py +++ b/holocron/ext/generators/blog.py @@ -169,14 +169,7 @@ class Blog(abc.Generator): The Atom specification: http://www.ietf.org/rfc/rfc4287.txt """ posts_number = self.app.conf['generators.blog.feed.posts_number'] - posts = posts[:posts_number] - save_as = self.app.conf['generators.blog.feed.save_as'] - save_as = os.path.join(self._output, save_as) - path = os.path.dirname(save_as) - - if path: - mkdir(path) credentials = { 'siteurl_self': normalize_url(self.app.conf['siteurl']) + save_as, @@ -185,8 +178,13 @@ class Blog(abc.Generator): 'date': datetime.datetime.utcnow().replace(microsecond=0) } + save_as = os.path.join(self._output, save_as) + path = os.path.dirname(save_as) + if not os.path.exists(path): + mkdir(path) + with open(save_as, 'w', encoding='utf-8') as f: f.write(self.feed_template.render( - documents=posts, + documents=posts[:posts_number], credentials=credentials ))
Fix feed link in feed.xml Recently we had a wrong link in feed.xml, because the link contained an output directory path. For example, we had the following XML-node: <link href="<URL>
ikalnytskyi_holocron
train
py
d0979bb5da36adf1c8b15ae1815c52cae20dacda
diff --git a/phantomcss.js b/phantomcss.js index <HASH>..<HASH> 100755 --- a/phantomcss.js +++ b/phantomcss.js @@ -474,7 +474,6 @@ function compareFiles( baseFile, file ) { casper.captureSelector( failFile, 'img' ); test.failFile = failFile; - console.log( 'Failure! Saved to ' + failFile ); } if ( file.indexOf( _diffImageSuffix + '.png' ) !== -1 ) { @@ -634,12 +633,14 @@ function initClient() { function _onPass( test ) { console.log( '\n' ); - casper.test.pass( 'No changes found for screenshot ' + test.filename ); + var name = 'Should look the same ' + test.filename; + casper.test.pass(name, {name: name}); } function _onFail( test ) { - console.log( '\n' ); - casper.test.fail( 'Visual change found for screenshot ' + test.filename + ' (' + test.mismatch + '% mismatch)' ); + console.log('\n'); + var name = 'Should look the same ' + test.filename; + casper.test.fail(name, {name:name, message: 'Looks different (' + test.mismatch + '% mismatch) ' + test.failFile }); } function _onTimeout( test ) {
Consistent test naming regardless of pass/fail for xunit as mentioned in issue <I>
HuddleEng_PhantomCSS
train
js
b975f3fa799707f3b4378a6f63e607673d18ab2c
diff --git a/docs/conf.py b/docs/conf.py index <HASH>..<HASH> 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -39,8 +39,11 @@ from annotypes import make_annotations # Mock out failing imports MOCK_MODULES = [ - "scanpointgenerator", "p4p", "plop", "plop.viewer", "h5py", "vdsgen", - "tornado", "tornado.options"] + "scanpointgenerator", + "p4p", "p4p.client.raw", + "plop", "plop.viewer", + "h5py", "vdsgen", "vdsgen.subframevdsgenerator", + "tornado", "tornado.options", "tornado.httpserver"] sys.modules.update((mod_name, MagicMock()) for mod_name in MOCK_MODULES) @@ -168,6 +171,7 @@ intersphinx_mapping = dict( 'http://scanpointgenerator.readthedocs.io/en/latest/', None), numpy=('https://docs.scipy.org/doc/numpy/', None), tornado=('http://www.tornadoweb.org/en/stable/', None), + p4p=('https://mdavidsaver.github.io/p4p-dev/', None) ) # A dictionary of graphviz graph attributes for inheritance diagrams.
Added some more mocks to the docs build
dls-controls_pymalcolm
train
py
1351d173c25c2c4b78bd197dd3ff0a903b96f3f0
diff --git a/alot/widgets/globals.py b/alot/widgets/globals.py index <HASH>..<HASH> 100644 --- a/alot/widgets/globals.py +++ b/alot/widgets/globals.py @@ -170,6 +170,8 @@ class CompleteEdit(urwid.Edit): self.on_exit(self.edit_text) elif key == 'esc': self.on_exit(None) + elif key == 'ctrl g': + self.on_exit(None) elif key == 'ctrl a': self.set_edit_pos(0) elif key == 'ctrl e':
add ctrl-g keybinding to cancel prompt
pazz_alot
train
py
746e8f2b8a3fc04248e8f2357a6f8df003fa5307
diff --git a/filehandle.py b/filehandle.py index <HASH>..<HASH> 100644 --- a/filehandle.py +++ b/filehandle.py @@ -6,7 +6,7 @@ try: except ImportError: import builtins -__version__ = '1.0.0-dev' +__version__ = '0.0.9' def open(filepath, mode='rb', buffcompress=None): '''
corrected version [skip ci]
necrolyte2_filehandle
train
py
9c6d6079be14c65e69939a1d81e9f2ca774a529c
diff --git a/core/eolearn/core/eodata.py b/core/eolearn/core/eodata.py index <HASH>..<HASH> 100644 --- a/core/eolearn/core/eodata.py +++ b/core/eolearn/core/eodata.py @@ -182,7 +182,7 @@ class EOPatch: if isinstance(content, dict) and content: content_str = '\n '.join(['{'] + ['{}: {}'.format(label, self._repr_value(value)) for label, value in - content.items()]) + '\n }' + sorted(content.items())]) + '\n }' else: content_str = self._repr_value(content) feature_repr_list.append('{}: {}'.format(attribute, content_str))
minor change in EOTask repr method
sentinel-hub_eo-learn
train
py
b2da81d31eff10e156ea19d0db8eb4a02345502b
diff --git a/modules/adomikAnalyticsAdapter.js b/modules/adomikAnalyticsAdapter.js index <HASH>..<HASH> 100644 --- a/modules/adomikAnalyticsAdapter.js +++ b/modules/adomikAnalyticsAdapter.js @@ -117,7 +117,7 @@ adomikAdapter.sendTypedEvent = function() { splittedUrl.forEach((split, i) => { const partUrl = `${split}&id=${adomikAdapter.currentContext.id}&part=${i}&on=${splittedUrl.length - 1}`; const img = new Image(1, 1); - img.src = 'http://' + adomikAdapter.currentContext.url + '/?q=' + partUrl; + img.src = 'https://' + adomikAdapter.currentContext.url + '/?q=' + partUrl; }) };
http -> https (#<I>)
prebid_Prebid.js
train
js
7473ed490215d0a18b6062f4ea97f97b71789a4e
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js index <HASH>..<HASH> 100644 --- a/lib/HotModuleReplacementPlugin.js +++ b/lib/HotModuleReplacementPlugin.js @@ -286,7 +286,6 @@ module.exports = class HotModuleReplacementPlugin { hotUpdateMainContent.c[chunkId] = true; currentChunk.files.push(filename); compilation.hooks.chunkAsset.call( - "HotModuleReplacementPlugin", currentChunk, filename );
Fix chunkAsset hook call The `compilation.hook.chunkAsset` hook expects 2 parameters, not three.
webpack_webpack
train
js
9020526a7e5dcb197938b7f15cbd57f8aae4a91d
diff --git a/tests/fake_webapp.py b/tests/fake_webapp.py index <HASH>..<HASH> 100644 --- a/tests/fake_webapp.py +++ b/tests/fake_webapp.py @@ -87,6 +87,26 @@ EXAMPLE_IFRAME_HTML = """\ </body> </html>""" +EXAMPLE_ALERT_HTML = """\ +<html> + <head> + <title>Alert Example Title</title> + <script type="text/javascript" src="/static/jquery.min.js"></script> + <script type="text/javascript"> + $(document).ready(function(){ + $('.alerta').click(function() { alert('This is an alert example.'); }); + + $('.pergunta').click(function() { nome = prompt('What is your name?'); alert(nome); }); + }) + </script> + </head> + <body> + <h1 class="alerta">Alert Example Title</h1> + <h2 class="pergunta">Prompt Example Subtitle</h2> + </body> +</html> +""" + app = Flask(__name__) @app.route('/') @@ -97,6 +117,10 @@ def index(): def iframed(): return EXAMPLE_IFRAME_HTML [email protected]('/alert') +def alertd(): + return EXAMPLE_ALERT_HTML + @app.route('/name', methods=['GET']) def get_name(): return "My name is: Master Splinter"
added the html and route for the alert tests
cobrateam_splinter
train
py
6a1c28918cdf347992705f4279d4ff888bd089fb
diff --git a/graylog2-server/src/main/java/org/graylog2/rest/resources/search/RelativeSearchResource.java b/graylog2-server/src/main/java/org/graylog2/rest/resources/search/RelativeSearchResource.java index <HASH>..<HASH> 100644 --- a/graylog2-server/src/main/java/org/graylog2/rest/resources/search/RelativeSearchResource.java +++ b/graylog2-server/src/main/java/org/graylog2/rest/resources/search/RelativeSearchResource.java @@ -95,11 +95,14 @@ public class RelativeSearchResource extends SearchResource { } } - /** - * CSV search result, needs to be chunked because these tend to be file exports and would cause heap problems if buffered. - */ @GET @Timed + @ApiOperation(value = "Message search with relative timerange.", + notes = "Search for messages in a relative timerange, specified as seconds from now. " + + "Example: 300 means search from 5 minutes ago to now.") @Produces("text/csv") + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Invalid timerange parameters provided.") + }) public ChunkedOutput<ScrollResult.ScrollChunk> searchRelativeChunked( @ApiParam(title = "query", description = "Query (Lucene syntax)", required = true) @QueryParam("query") String query, @ApiParam(title = "range", description = "Relative timeframe to search in. See method description.", required = true) @QueryParam("range") int range,
Add missing @ApiOperation and @ApiResponse annotations. The text/csv /search/universal/relative endpoint shows up in the API docs now. Also remove outdated comment.
Graylog2_graylog2-server
train
java
b8a1250ef0745e62d16a195942ee61611239dcb2
diff --git a/java/client/src/org/openqa/selenium/internal/selenesedriver/SendKeys.java b/java/client/src/org/openqa/selenium/internal/selenesedriver/SendKeys.java index <HASH>..<HASH> 100644 --- a/java/client/src/org/openqa/selenium/internal/selenesedriver/SendKeys.java +++ b/java/client/src/org/openqa/selenium/internal/selenesedriver/SendKeys.java @@ -46,7 +46,7 @@ public class SendKeys extends ElementFunction<Void> { "(function() { " + "var e = selenium.browserbot.findElement('%s');" // Do a check to see if we're in an extension - + "if (Components && Components['classes'] && XPCNativeWrapper) {" + + "if (bot.userAgent.FIREFOX_EXTENSION && Components && Components['classes'] && XPCNativeWrapper) {" + " e = core.firefox.unwrap(e);" + "}" + "bot.action.type(e, '%s');})();",
LukeIS: making SendKeys in WebDriverBackedSelenium for Safari work (again?) and i wish there were tests r<I>
SeleniumHQ_selenium
train
java
e346b3f7144c8ace07396c6270ca8141ac4f3fe4
diff --git a/core/src/main/java/com/twitter/elephantbird/mapreduce/io/ProtobufConverter.java b/core/src/main/java/com/twitter/elephantbird/mapreduce/io/ProtobufConverter.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/com/twitter/elephantbird/mapreduce/io/ProtobufConverter.java +++ b/core/src/main/java/com/twitter/elephantbird/mapreduce/io/ProtobufConverter.java @@ -45,14 +45,18 @@ public class ProtobufConverter<M extends Message> implements BinaryConverter<M> this.typeRef = typeRef; } - @SuppressWarnings("unchecked") @Override public M fromBytes(byte[] messageBuffer) { + return fromBytes(messageBuffer, 0, messageBuffer.length); + } + + @SuppressWarnings("unchecked") + public M fromBytes(byte[] messageBuffer, int offset, int len) { try { if (protoBuilder == null) { protoBuilder = Protobufs.getMessageBuilder(typeRef.getRawClass()); } - return (M) protoBuilder.clone().mergeFrom(messageBuffer).build(); + return (M) protoBuilder.clone().mergeFrom(messageBuffer, offset, len).build(); } catch (InvalidProtocolBufferException e) { logWarning("Invalid Protobuf exception while building " + typeRef.getRawClass().getName(), e); } catch(UninitializedMessageException ume) {
provide a more efficient fromBytes() method for ProtobufWritable.
twitter_elephant-bird
train
java
f170c56c035ac15e61cc3019417b0926af6e7543
diff --git a/executor/explain.go b/executor/explain.go index <HASH>..<HASH> 100644 --- a/executor/explain.go +++ b/executor/explain.go @@ -15,7 +15,6 @@ package executor import ( "github.com/cznic/mathutil" - "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/chunk" "golang.org/x/net/context" ) @@ -28,19 +27,6 @@ type ExplainExec struct { cursor int } -// Next implements Execution Next interface. -func (e *ExplainExec) Next(ctx context.Context) (Row, error) { - if e.cursor >= len(e.rows) { - return nil, nil - } - resultRow := make([]types.Datum, 0, len(e.rows[0])) - for i := range e.rows[e.cursor] { - resultRow = append(resultRow, types.NewStringDatum(e.rows[e.cursor][i])) - } - e.cursor++ - return resultRow, nil -} - // Close implements the Executor Close interface. func (e *ExplainExec) Close() error { e.rows = nil
executor: remove Next function for ExplainExec (#<I>)
pingcap_tidb
train
go
fc3dca83b87cec60ccad05fa5f5f5aeab223d8f6
diff --git a/lib/pdf_forms/pdf.rb b/lib/pdf_forms/pdf.rb index <HASH>..<HASH> 100644 --- a/lib/pdf_forms/pdf.rb +++ b/lib/pdf_forms/pdf.rb @@ -20,7 +20,7 @@ module PdfForms def read_fields field_output = @pdftk.call_pdftk quote_path(path), 'dump_data_fields' @fields = field_output.split(/^---\n/).map do |field_text| - if field_text =~ /^FieldName: (\w+)$/ + if field_text =~ /^FieldName:\s*(.+?)\s*$/ $1 end end.compact.uniq diff --git a/test/pdf_test.rb b/test/pdf_test.rb index <HASH>..<HASH> 100644 --- a/test/pdf_test.rb +++ b/test/pdf_test.rb @@ -6,7 +6,7 @@ class PdfTest < Test::Unit::TestCase @pdftk = PdfForms::PdftkWrapper.new 'pdftk' end - def test_fields + def test_fields pdf = PdfForms::Pdf.new 'test/fixtures/form.pdf', @pdftk assert fields = pdf.fields assert fields.any?
allow for fieldnames with spaces.
jkraemer_pdf-forms
train
rb,rb
47dafef79a08f66f26256ac869f92d165c9bf19c
diff --git a/admin/repository.php b/admin/repository.php index <HASH>..<HASH> 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -92,7 +92,10 @@ if (!empty($edit) || !empty($new)) { //display instances list and creation form if ($edit){ - repository_display_instances_list(get_context_instance(CONTEXT_SYSTEM), true, $edit); + if (repository_static_function($edit,"has_instance_config") + || repository_static_function($edit,"has_multiple_instances")){ + repository_display_instances_list(get_context_instance(CONTEXT_SYSTEM), true, $edit); + } } }
MDL-<I>: if a type has no multiple instances and cannot configure an instance, so do not display the list of instance for this type.
moodle_moodle
train
php
72b3f07316f1d7f99f5f7171d3ec36751914d0e5
diff --git a/src/Google/Service/Calendar.php b/src/Google/Service/Calendar.php index <HASH>..<HASH> 100644 --- a/src/Google/Service/Calendar.php +++ b/src/Google/Service/Calendar.php @@ -1103,7 +1103,7 @@ class Google_Service_Calendar_CalendarList_Resource extends Google_Service_Resou * @opt_param bool showDeleted Whether to include deleted calendar list entries * in the result. Optional. The default is False. * @opt_param string minAccessRole The minimum access role for the user in the - * returned entries. Optional. The default is no restriction. + * returned entires. Optional. The default is no restriction. * @opt_param int maxResults Maximum number of entries returned on one result * page. By default the value is 100 entries. The page size can never be larger * than 250 entries. Optional. @@ -1182,7 +1182,7 @@ class Google_Service_Calendar_CalendarList_Resource extends Google_Service_Resou * @opt_param bool showDeleted Whether to include deleted calendar list entries * in the result. Optional. The default is False. * @opt_param string minAccessRole The minimum access role for the user in the - * returned entries. Optional. The default is no restriction. + * returned entires. Optional. The default is no restriction. * @opt_param int maxResults Maximum number of entries returned on one result * page. By default the value is 100 entries. The page size can never be larger * than 250 entries. Optional.
Updated Calendar.php This change has been generated by a script that has detected changes in the discovery doc of the API. Check <URL>
googleapis_google-api-php-client
train
php
399801f5cfc767786c7e21b6b47cf32d6e93beca
diff --git a/app.js b/app.js index <HASH>..<HASH> 100644 --- a/app.js +++ b/app.js @@ -74,6 +74,19 @@ function view (module, args) { }); } +app.cmd('node *', function (page) { + var url = 'https://raw.github.com/joyent/node/master/doc/api/'+page+'.markdown'; + request(url, function (error, response, body) { + markdisp(body); + }); +}); + +app.cmd('https?://*', function () { + request(module, function (error, response, body) { + markdisp(body); + }); +}); + app.router.notfound = function () { var args = app.argv._; var module = args.shift(); @@ -118,13 +131,6 @@ app.router.notfound = function () { listModules(); } - else if (/^https?:\/\//.test(module)) { - process.stdin.pause(); - request(module, function (error, response, body) { - markdisp(body); - }); - } - else { process.stdin.pause(); // we have some arguments.. check to see if they're a filename
support for node core docs
rf_nd
train
js
6a23baaa8505996812eb1d4f65681859f12c0e4b
diff --git a/src/Lemonblast/Cbor4Php/Cbor.php b/src/Lemonblast/Cbor4Php/Cbor.php index <HASH>..<HASH> 100644 --- a/src/Lemonblast/Cbor4Php/Cbor.php +++ b/src/Lemonblast/Cbor4Php/Cbor.php @@ -275,8 +275,11 @@ class Cbor { // Convert to byte array $bytes = unpack(PackFormat::UNIT_8_SET, $string); - // Reverse it, you want MSB first - $bytes = array_reverse($bytes); + // Reverse it on little endian systems, you want MSB first + if (!self::isBigEndian()) + { + $bytes = array_reverse($bytes); + } // Get parameters $sign = ($bytes[0] >> 7) & 0b1; // Sign is the first bit @@ -353,7 +356,7 @@ class Cbor { $string = ''; // A big endian system doesn't need the array reverse - if(self::isBigEndian()) + if (self::isBigEndian()) { foreach ($double_bytes as $byte) { @@ -792,6 +795,16 @@ class Cbor { { return pack('L', 1) === pack('N', 1); } + + /** + * Determines if the PHP install is little endian. + * + * @return bool True if little endian, false otherwise. + */ + function isLittleEndian() + { + return unpack('S',"\x01\x00")[1] === 1; + } } ?>
Added isLittleEndian method
Lemonblast_Cbor4Php
train
php
f5de27854ce37187b0bfe82c6e14d533c272b1fb
diff --git a/zounds/core/axis.py b/zounds/core/axis.py index <HASH>..<HASH> 100644 --- a/zounds/core/axis.py +++ b/zounds/core/axis.py @@ -64,6 +64,11 @@ class ArrayWithUnits(np.ndarray): return obj + @property + def T(self): + arr = super(ArrayWithUnits, self).T + return ArrayWithUnits(arr, self.dimensions[::-1]) + def kwargs(self): return self.__dict__ @@ -211,12 +216,23 @@ class ArrayWithUnits(np.ndarray): except (AttributeError, TypeError): yield sl + def _is_integer_based_slice(self, sl): + if not isinstance(sl, slice): + return False + + try: + return \ + (sl.start is None or sl.start.bit_length()) \ + and (sl.stop is None or sl.stop.bit_length()) + except AttributeError: + return False + def _compute_indices(self, index): dims_pos = 0 for sl in index: if sl is None \ or isinstance(sl, int) \ - or isinstance(sl, slice) \ + or self._is_integer_based_slice(sl) \ or isinstance(sl, list): # burn one dims_pos += 1
ArrayWithUnits supports non-integer-based slices
JohnVinyard_zounds
train
py
816c43b9d7b859a2961838b4d074ffb91c62b512
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,9 @@ setup( long_description=open("README.rst").read(), license="GPL", author='Andrew McFague', - author_email='[email protected]', + author_email='[email protected]', + maintainer='Andrew McFague', + maintainer_email='[email protected]', url='https://github.com/amcfague/webunit2', zip_safe=True, packages=find_packages(exclude=["ez_setup", "tests"]),
Updating maintainer and email info
amcfague_webunit2
train
py
b50dbe42ed00b6f52e4b31381e1f35caf3221807
diff --git a/test/client/test_sql_client.py b/test/client/test_sql_client.py index <HASH>..<HASH> 100644 --- a/test/client/test_sql_client.py +++ b/test/client/test_sql_client.py @@ -3,6 +3,7 @@ import unittest from cartoframes.client import SQLClient from cartoframes import context +from cartoframes.auth import Credentials SQL_SELECT_RESPONSE = { 'rows': [{ @@ -71,15 +72,6 @@ SQL_BATCH_RESPONSE = { } -class MockCredentials(): - def __init__(self, username, api_key): - self._username = username - self._api_key = api_key - - def username(self): - return self._username - - class MockContext(): def __init__(self): self.query = '' @@ -99,8 +91,8 @@ class TestSQLClient(unittest.TestCase): self._mock_context = MockContext() # Mock create_context method context.create_context = lambda c, s: self._mock_context - creds = MockCredentials('user_name', '1234567890') - self._sql_client = SQLClient(creds) + credentials = Credentials('1234567890', 'user_name') + self._sql_client = SQLClient(credentials) def test_query(self): """client.SQLClient.query"""
removing other MockCredentials
CartoDB_cartoframes
train
py
3cc999ffe676f37ac079310bd0c6d999ff649915
diff --git a/cumulusci/core/config.py b/cumulusci/core/config.py index <HASH>..<HASH> 100644 --- a/cumulusci/core/config.py +++ b/cumulusci/core/config.py @@ -977,7 +977,7 @@ class ScratchOrgConfig(OrgConfig): 'devhub': ' --targetdevhubusername {}'.format(self.devhub) if self.devhub else '', 'namespaced': ' -n' if not self.namespaced else '', 'days': ' --durationdays {}'.format(self.days) if self.days else '', - 'alias': ' -a {}'.format(self.sfdx_alias) if self.sfdx_alias else '', + 'alias': ' -a "{}"'.format(self.sfdx_alias) if self.sfdx_alias else '', 'extraargs': os.environ.get('SFDX_ORG_CREATE_ARGS', ''), }
use quotes around org alias command line option
SFDO-Tooling_CumulusCI
train
py
34ae6341bcb3dd76beb61a28db5a8de11653835e
diff --git a/utils/src/main/java/org/owasp/dependencycheck/utils/JsonArrayFixingInputStream.java b/utils/src/main/java/org/owasp/dependencycheck/utils/JsonArrayFixingInputStream.java index <HASH>..<HASH> 100644 --- a/utils/src/main/java/org/owasp/dependencycheck/utils/JsonArrayFixingInputStream.java +++ b/utils/src/main/java/org/owasp/dependencycheck/utils/JsonArrayFixingInputStream.java @@ -127,7 +127,7 @@ public class JsonArrayFixingInputStream extends InputStream { * @return the offset if found; otherwise <code>-1</code> */ private int getClosingBraceOffset() { - for (int pos = bufferStart; pos < (bufferStart + bufferAvailable); pos++) { + for (int pos = bufferStart; pos < BUFFER_SIZE && pos < (bufferStart + bufferAvailable); pos++) { if (buffer[pos] == '}') { return pos - bufferStart; }
index check added per #<I>
jeremylong_DependencyCheck
train
java
e6240ce28abb7eddf91358b14143f33c8e320a5e
diff --git a/src/nwmatcher.js b/src/nwmatcher.js index <HASH>..<HASH> 100644 --- a/src/nwmatcher.js +++ b/src/nwmatcher.js @@ -126,7 +126,7 @@ NW.Dom = (function(global) { (div.style.width = 1) && div.style.width != '1px'; div = null; - return !!isStrict ? 'CSS1Compat' : 'BackCompat'; + return !isStrict; })(), // XML works in W3C browsers
fixed Safari 2 detection of Strict/Quirks mode after merging of 'isQuirks' and 'compatMode' (kangax)
dperini_nwmatcher
train
js
710ba48fda112c0f454eb610a7a17edb7c502bd9
diff --git a/noseOfYeti/plugins/sphinx.py b/noseOfYeti/plugins/sphinx.py index <HASH>..<HASH> 100644 --- a/noseOfYeti/plugins/sphinx.py +++ b/noseOfYeti/plugins/sphinx.py @@ -14,7 +14,7 @@ def enable(app): tok = Tokeniser( default_kls = config.get('noy_default_kls')[0] , import_tokens = imports - , wrapped_setup = options.wrapped_setup + , wrapped_setup = config.get('noy_wrapped_setup')[0] , with_describe_attrs = not config.get('noy_no_describe_attrs')[0] )
Sphinx plugin was using nonexistant options
delfick_nose-of-yeti
train
py
ab7f89f4f0dc7bd9fe2248c84d57020c59230681
diff --git a/src/web/js/azkaban/view/flow-job.js b/src/web/js/azkaban/view/flow-job.js index <HASH>..<HASH> 100644 --- a/src/web/js/azkaban/view/flow-job.js +++ b/src/web/js/azkaban/view/flow-job.js @@ -109,7 +109,7 @@ azkaban.JobListView = Backbone.View.extend({ var child = $(liElement).children("a"); $(child).removeClass(statusList.join(' ')); $(child).addClass(node.status); - $(child).attr("title", node.status + " (" + node.type + ")").tooltip('fixTitle'); + $(child).attr("title", node.status + " (" + node.type + ")"); } if (node.nodes) { @@ -126,7 +126,6 @@ azkaban.JobListView = Backbone.View.extend({ // this.assignInitialStatus(self); this.handleDisabledChange(self); this.changeStatuses(data, 0); - $("li.listElement > a").tooltip({delay: {show: 500, hide: 100}, placement: 'top'}); }, renderTree : function(el, data, prefix) { var nodes = data.nodes;
Removed bootstrap tooltip on the job list, because it does weird things to the layout.
azkaban_azkaban
train
js
03b0f9474255d500620bc780725b345cb83f3a6f
diff --git a/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php b/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php index <HASH>..<HASH> 100644 --- a/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php +++ b/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php @@ -94,7 +94,7 @@ class PostgreSqlPlatform extends AbstractPlatform public function getDateDiffExpression($date1, $date2) { - return '('.$date1 . '-'.$date2.')'; + return '(DATE(' . $date1 . ')-DATE(' . $date2 . '))'; } public function getDateAddDaysExpression($date, $days)
DDC-<I> - Fix date diff in PostgreSQL when timestamps are passed by casting everything into dates explicitly.
doctrine_dbal
train
php
400d410ad5af0d58bafe72c8d94dc40c49d18984
diff --git a/test/integration/client/notice-tests.js b/test/integration/client/notice-tests.js index <HASH>..<HASH> 100644 --- a/test/integration/client/notice-tests.js +++ b/test/integration/client/notice-tests.js @@ -1,5 +1,7 @@ var helper = require(__dirname + '/test-helper'); test('emits notice message', function() { + //TODO this doesn't work on all versions of postgres + return false; var client = helper.client(); client.query('create temp table boom(id serial, size integer)'); assert.emits(client, 'notice', function(notice) {
remove failing, postgreSQL version specific test notify test fails on the version of postgres running on travis. I need to investigate this. Since it's an extremely non-important test & coupled to a particular version of postgres I'm going to remove until I can figure out a better way to reproduce.
brianc_node-postgres
train
js